[Pkg-gnupg-commit] [gnupg2] 42/42: New upstream version 2.2.4
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed Jan 3 18:25:58 UTC 2018
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch upstream
in repository gnupg2.
commit cc7610f5da968130545d0fad9ddb421070b97d73
Merge: 57308e1 558b175
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Wed Dec 20 08:58:36 2017 -0500
New upstream version 2.2.4
ChangeLog | 226 +++++
NEWS | 33 +
VERSION | 2 +-
agent/gpg-agent.c | 28 +-
agent/protect.c | 2 +-
agent/t-protect.c | 2 +-
build-aux/speedo.mk | 5 +-
common/homedir.c | 14 +-
configure.ac | 18 +-
dirmngr/Makefile.am | 4 +
dirmngr/dirmngr.c | 32 +-
dirmngr/dirmngr.h | 25 +-
dirmngr/domaininfo.c | 291 ++++++
dirmngr/ks-action.c | 3 +-
dirmngr/misc.c | 7 +-
dirmngr/server.c | 186 +++-
dirmngr/workqueue.c | 214 +++++
doc/HACKING | 1 +
doc/defsincdate | 2 +-
doc/dirmngr.texi | 4 +
doc/examples/gpgconf.conf | 7 +-
doc/gpg-agent.texi | 14 +
doc/gpg.texi | 12 +-
doc/scdaemon.texi | 6 +
doc/tools.texi | 8 +
doc/wks.texi | 37 +-
g10/cipher.c | 226 ++---
g10/cpr.c | 8 +-
g10/distsigkey.gpg | Bin 3452 -> 3267 bytes
g10/export.c | 5 +
g10/filter.h | 5 +-
g10/getkey.c | 138 +--
g10/keygen.c | 42 +-
g10/keyid.c | 18 +-
g10/parse-packet.c | 6 +
g10/pkclist.c | 49 +-
g10/revoke.c | 15 +-
g10/tofu.c | 82 +-
g10/trustdb.c | 6 +-
po/ca.po | 869 +++++++++---------
po/cs.po | 2146 ++++++++++++++++++++-------------------------
po/da.po | 868 +++++++++---------
po/de.po | 872 +++++++++---------
po/el.po | 869 +++++++++---------
po/en at boldquot.po | 869 +++++++++---------
po/en at quot.po | 869 +++++++++---------
po/eo.po | 869 +++++++++---------
po/es.po | 868 +++++++++---------
po/et.po | 869 +++++++++---------
po/fi.po | 869 +++++++++---------
po/fr.po | 868 +++++++++---------
po/gl.po | 869 +++++++++---------
po/gnupg2.pot | 867 +++++++++---------
po/hu.po | 869 +++++++++---------
po/id.po | 869 +++++++++---------
po/it.po | 869 +++++++++---------
po/ja.po | 882 ++++++++++---------
po/nb.po | 868 +++++++++---------
po/pl.po | 868 +++++++++---------
po/pt.po | 869 +++++++++---------
po/ro.po | 874 +++++++++---------
po/ru.po | 875 +++++++++---------
po/sk.po | 870 +++++++++---------
po/sv.po | 868 +++++++++---------
po/tr.po | 868 +++++++++---------
po/uk.po | 868 +++++++++---------
po/zh_CN.po | 869 +++++++++---------
po/zh_TW.po | 868 +++++++++---------
scd/apdu.c | 9 +-
scd/app.c | 10 +-
scd/ccid-driver.c | 10 +-
scd/scdaemon.c | 17 +-
sm/gpgsm.c | 2 +
tools/applygnupgdefaults | 2 +-
tools/gpg-wks-server.c | 195 +++-
tools/gpgconf-comp.c | 34 +-
tools/gpgconf.c | 112 ++-
tools/gpgconf.h | 4 +
78 files changed, 14948 insertions(+), 13725 deletions(-)
diff --cc ChangeLog
index 79efa05,8bd68a6..93b7e63
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,25058 -1,16 +1,25284 @@@
-No more ChangeLog files
-========================
++2017-12-20 Werner Koch <wk at gnupg.org>
+
-Do not modify any of the ChangeLog files in GnuPG. Starting on
-December 1st, 2011 we put change information only in the GIT commit
-log, and generate a top-level ChangeLog file from logs at "make dist"
-time. As such, there are strict requirements on the form of the
-commit log messages. See doc/HACKING for details. The old ChangeLog
-files have all be renamed to ChangeLog-2011.
++ Release 2.2.4.
++ + commit 558b17593ae97b8a07d06bf0d6af1a626b304501
+
+
++2017-12-19 Petr Pisar <petr.pisar at atlas.cz>
+
-Local Variables:
-buffer-read-only: t
-mode: text
-End:
++ po: Update Czech translation.
++ + commit 43aaf60449036e870cc25b77fbb7312cf3fb534c
++
++
++2017-12-19 Ineiev <ineiev at gnu.org>
++
++ po: Update Russian translation.
++ + commit c7b8ec6c8e57797f0b77dbf7fca85fb600323328
++
++
++2017-12-19 Werner Koch <wk at gnupg.org>
++
++ wks: New server options --check, --with-dir, with-file.
++ + commit 7449063b1af2eef73d621a69cdb2fb713ab1ae6c
++ * tools/gpg-wks-server.c (aCheck, oWithDir, oWithFile): New const.
++ (opts): New options --check, --with-dir, and --with-file.
++ (main): Call command_check_key.
++ (command_list_domains): Implement option --with-dir.
++ (fname_from_userid): New.
++ (command_check_key): New.
++ (command_remove_key): Implement existsing command.
++ (command_revoke_key): Call command_remove_key as a simple
++ implementation.
++
++2017-12-18 Werner Koch <wk at gnupg.org>
++
++ conf: New option --status-fd.
++ + commit 482e000b8a7e336f342a7fac3b7379257e944b6e
++ * tools/gpgconf.c (oStatusFD): New const.
++ (opts): New option --status-fd.
++ (statusfp): New var.
++ (set_status_fd): New.
++ (gpgconf_write_status): New.
++ (gpgconf_failure): New.
++ (main): Set status fd and replace exit by gpgconf_failure.
++ * tools/gpgconf-comp.c: Repalce exit by gpgconf_failure.
++ (gc_process_gpgconf_conf): Print a few warning status messages.
++
++ gpgconf: Show --compliance in expert mode.
++ + commit d74c40cef0a97cd98aa05f13b1541a94eda502a6
++ * tools/gpgconf-comp.c (gc_options_gpg): Set compliance to expert.
++ (gc_options_gpgsm): Ditto.
++
++ sm: Allow explicit setting of the default --compliance=gnupg.
++ + commit 8c878ae4c9dfa9fe26aa15f4f9db3e86833575e9
++ * sm/gpgsm.c (main): Allow setting of the default compliance.
++ * tools/gpgconf-comp.c (gc_options_gpgsm): Add "compliance".
++
++2017-12-18 NIIBE Yutaka <gniibe at fsij.org>
++
++ po: Update Japanese translation.
++ + commit e3ddeff66e8c08a37ddf8b6510d69579c245e192
++ * po/ja.po: Fix message with no "%s".
++
++2017-12-13 Werner Koch <wk at gnupg.org>
++
++ gpg: Print a warning for too much data encrypted with 3DES et al.
++ + commit 416cf9e9be5d2daf0ef629208031989699b3653f
++ * g10/filter.h (cipher_filter_context_t): Remove unused filed
++ 'create_mdc'. Turn field 'header' into a bit field. Add new fields
++ 'short_blklen_warn' and 'short_blklen_count'.
++ * g10/cipher.c (write_header): Print a warning if MDC is not used.
++ (cipher_filter): Print a warning for long messages encrypted with a
++ short block length algorithm.
++
++ gpg: Simplify cipher:write_header.
++ + commit b5333e13cbc9db354ed90762190bf70605a02d1f
++ * g10/cipher.c (write_header): Use write_status_printf.
++
++ gpg: Simplify default_recipient().
++ + commit 9f641430dcdecbd7ee205d407cb19bb4262aa95d
++ * g10/pkclist.c (default_recipient): Use hexfingerprint.
++
++ gpg: Return an error from hexfingerprint on malloc error.
++ + commit cd26c5482b10bee7658959ae913f2ddb83190587
++ * g10/keyid.c (hexfingerprint): Return NULL on malloc failure. Chnage
++ all callers.
++
++ gpg: Remove some xmallocs.
++ + commit 29119a6492eda5dd7920e45e7f2faa043d436591
++ * g10/getkey.c (get_pubkeys): Do not use xmalloc.
++
++2017-12-12 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
++
++ gpg: default-preference-list: prefer SHA512.
++ + commit 8ede3ae29a39641a2f98ad9a4cf61ea99085a892
++ * g10/keygen.c (keygen_set_std_prefs): when producing default internal
++ personal-digest-preferences, keep the same order. When publishing
++ external preferences, state preference for SHA512 first.
++
++2017-12-12 Werner Koch <wk at gnupg.org>
++
++ Change backlog from 5 to 64 and provide option --listen-backlog.
++ + commit c81a447190d2763ac4c64b2e74e22e824da8aba3
++ * agent/gpg-agent.c (oListenBacklog): New const.
++ (opts): New option --listen-backlog.
++ (listen_backlog): New var.
++ (main): Parse new options.
++ (create_server_socket): Use var instead of 5.
++ * dirmngr/dirmngr.c: Likewise.
++ * scd/scdaemon.c: Likewise.
++
++ build: New configure option --enable-run-gnupg-user-socket.
++ + commit 17efcd2a2acdc3b7f00711272aa51e5be2476921
++ * configure.ac: (USE_RUN_GNUPG_USER_SOCKET): New ac_define.
++ * common/homedir.c (_gnupg_socketdir_internal): Add extra directories.
++
++2017-12-11 Werner Koch <wk at gnupg.org>
++
++ dirmngr: Check for WKD support at session end.
++ + commit 20b52be9ca29b0bc843fc68a279cb72728ede72f
++ * dirmngr/domaininfo.c (insert_or_update): Copy the name.
++ * dirmngr/misc.c (copy_stream): Allow arg OUT to be NULL.
++ * dirmngr/server.c (set_error): Protect CTX.
++ (dirmngr_status): Protect against missing ASSUAN_CTX.
++ (dirmngr_status_help): Ditto.
++ (dirmngr_status_printf): Ditto.
++ (cmd_wkd_get): Factor code out to ...
++ (proc_wkd_get): new func. Support silent operation with no CTX.
++ (task_check_wkd_support): New.
++
++ dirmngr: Add a background task framework.
++ + commit f2997adee0455c8c0fa391a853ec1b0c9fc43342
++ * dirmngr/workqueue.c: New.
++ * dirmngr/Makefile.am (dirmngr_SOURCES): Add new file.
++ * dirmngr/server.c (server_local_s): New field session_id.
++ (cmd_wkd_get): Add a task.
++ (task_check_wkd_support): New stub function.
++ (cmd_getinfo): New sub-commands "session_id" and "workqueue".
++ (start_command_handler): Add arg session_id and store it in
++ SERVER_LOCAL.
++ (dirmngr_status_helpf): New.
++ * dirmngr/dirmngr.h (wqtask_t): New type.
++ * dirmngr/dirmngr.c (main): Pass 0 as session_id to
++ start_command_handler.
++ (start_connection_thread): Introduce a session_id and pass it to
++ start_command_handler. Run post session tasks.
++ (housekeeping_thread): Run global workqueue tasks.
++
++ dirmngr: Limit the number of cached domains for WKD.
++ + commit 7a663c296e687f12ccd9a21d414de780feb4dfcf
++ * dirmngr/domaininfo.c (MAX_DOMAINBUCKET_LEN): New.
++ (insert_or_update): Limit the length of a bucket chain.
++ (domaininfo_print_stats): Print just one summary line.
++
++ (cherry picked from commit 26f08343fbccdbaa177c3507a3c5e24a5cf94a2d)
++
++ dirmngr: Keep track of domains used for WKD queries.
++ + commit 6c1dcd79cf0977844179d9a7b189c10af5e42a7e
++ * dirmngr/domaininfo.c: New file.
++ * dirmngr/Makefile.am (dirmngr_SOURCES): Add file.
++ * dirmngr/server.c (cmd_wkd_get): Check whether the domain is already
++ known and tell domaininfo about the results.
++
++2017-12-08 NIIBE Yutaka <gniibe at fsij.org>
++
++ agent: Fix description of shadow format.
++ + commit 5c121d44443b0a96ec6ea82b90717e3dbafd2cc5
++ * agent/keyformat.txt, agent/protect.c, agent/t-protect.c: Fix.
++
++2017-12-07 Werner Koch <wk at gnupg.org>
++
++ build: Do not define logging.h constants for libgpg-error dev versions.
++ + commit 2fedf8583bcc493f587c90bc9632d25dfd10bd10
++ * common/logging.h [GPGRT_LOG_WITH_PREFIX]: Do not define the log
++ constants.
++
++2017-12-07 NIIBE Yutaka <gniibe at fsij.org>
++
++ agent: Change intialization of assuan socket system hooks.
++ + commit b9677ba16f6b386896781a751e4b2fc839e3ec81
++ * agent/gpg-agent.c (initialize_modules): Add hook again.
++ (main): Remove setting of the system houk but add scoket system hook
++ setting after assuan initialization.
++
++2017-12-06 NIIBE Yutaka <gniibe at fsij.org>
++
++ agent: Set assuan system hooks before call of assuan_sock_init.
++ + commit 1524ba9656f0205d8c6ef504f773b832a7a12ab9
++ * agent/gpg-agent.c (initialize_modules): Move assuan_set_system_hooks.
++ (main): ... here, just before assuan_sock_init.
++
++2017-12-04 NIIBE Yutaka <gniibe at fsij.org>
++ Damien Goutte-Gattat <dgouttegattat at incenp.org>
++
++ g10: Fix regexp sanitization.
++ + commit 0d0b9eb0d4f99e8d293a4ce4b90921a879905115
++ * g10/trustdb.c (sanitize_regexp): Only escape operators.
++
++2017-11-26 Werner Koch <wk at gnupg.org>
++
++ gpg: Do not read from uninitialized memory with --list-packets.
++ + commit 4cf3cc6e3d48c8400466ca29c3f1c22ed2da6c2c
++ * g10/parse-packet.c (parse_plaintext): Fill up the allocated NAME.
++
++2017-11-24 Werner Koch <wk at gnupg.org>
++
++ agent: New option --auto-expand-secmem.
++ + commit 18af15249de5f826c3fa8d1d40e876734adcd0cf
++ * agent/gpg-agent.c (oAutoExpandSecmem): New enum value.
++ (opts): New option --auto-expand-secmem.
++ (main): Implement that option.
++
++2017-11-22 Werner Koch <wk at gnupg.org>
++
++ gpg: Fix memory leaking for long inputs via --command-fd.
++ + commit ea28ea18f3ee6c9f5e69986f39848398b58e242e
++ * g10/cpr.c (do_get_from_fd): Free the old buffer.
++
++2017-11-21 NIIBE Yutaka <gniibe at fsij.org>
++
++ scd: Enable card removal check after select_application.
++ + commit 0bb7fd0cab2d53cd0d44b21301b23edfe817e66b
++ * scd/apdu.c (open_ccid_reader): Fix error handling of ccid_get_atr.
++ * scd/app.c (select_application): Always kick the loop if new APP.
++ * scd/ccid-driver.c (ccid_open_usb_reader): Don't setup at open.
++ (ccid_slot_status): Setup interrupt transfer when !ON_WIRE.
++
+2017-11-20 Werner Koch <wk at gnupg.org>
+
+ Release 2.2.3.
+ + commit 97f4feaaca8da4dcf1ca09a2016693155016f06b
+
+
+ build: Use -Werror only for the check.
+ + commit 04d9833e71cc9d0c087faec091c29b0b6cf69488
+ * configure.ac: Do not add -Werror to mycflags.
+
+ gpg-agent: Avoid getting stuck in shutdown pending state.
+ + commit 7ffedfab8909a45a4b0347a5f7b52222e8439f1d
+ * agent/gpg-agent.c (handle_connections): Always check inotify fds.
+
+2017-11-20 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Use clock or clock_gettime for calibration.
+ + commit 760aa8aadafb747f33a1461ab0c2570b5ae43716
+ * agent/protect.c (calibrate_get_time): Use clock or clock_gettime.
+
+ build: Check -Wlogical-op flag availability with -Werror.
+ + commit 3ecd1a41be7c880976987d13e88342c98f37e064
+ * configure.ac: Use -Werror.
+
+ build: BSD make support for yat2m.
+ + commit e1984969cac06a88c7e6f5e49e5c3104d10a847d
+ * configure.ac (YAT2M): Only define when found.
+ * doc/Makefile.am: Portability fix.
+
+2017-11-17 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix double free of a hash context in the error case.
+ + commit 2aa106d6a4e2b09c257e8d769895d93ebb7f7edf
+ * dirmngr/crlcache.c: Clearly document that this fucntions takes
+ ownership of MD.
+ (abort_sig_check): Allow NULL for MD.
+ (crl_parse_insert): Immediately set MD to NULL. Remove check for md
+ before a calling abort_sig_check.
+
+2017-11-15 Andre Heinecke <aheinecke at intevation.de>
+
+ w32: Fix default registry path.
+ + commit 4f5afaf1fdb5cb13859aca390ccb5a1ba1dba00c
+ * configure.ac (GNUPG_REGISTRY_DIR): Remove leading backslash.
+
+ gpgtar: Prefer --set-filename over implicit name.
+ + commit 878b8bfdcc3a8becfc46b9287a2d14cd3c875f28
+ * tools/gpgtar-extract.c: Prefer opt.filename over filename
+ for the directory prefix.
+
+2017-11-15 Werner Koch <wk at gnupg.org>
+
+ gpg: Print AKL info only in verbose mode.
+ + commit b062ea5bc25157c942047b3fe7f5182a06106340
+ * g10/getkey.c (get_pubkey_byname): Print info only in verbose mode.
+
+2017-11-14 Andre Heinecke <aheinecke at intevation.de>
+
+ sm, w32: Fix initial keybox creation.
+ + commit 5ecef193bc2144e6d51a6bd5727bfd08a0d28b66
+ * sm/keydb.c (maybe_create_keybox): Open new keybox in bin mode.
+
+2017-11-07 Werner Koch <wk at gnupg.org>
+
+ Release 2.2.2.
+ + commit 5bd515005032f9340bd73e4346bbd0aef8518074
+
+
+ dirmngr: Reduce default LDAP timeout to 15 seconds.
+ + commit 30f21f8b0fa6844a9bba3f24dc41b3ac32170109
+ * dirmngr/dirmngr.c (DEFAULT_LDAP_TIMEOUT): Change to 15.
+ * dirmngr/dirmngr_ldap.c (DEFAULT_LDAP_TIMEOUT): Ditto.
+
+ (cherry picked from commit ab7ac827041b5cd97bbca7a75b0930072dd6611f)
+
+ speedo: Include software versions in the W32 README.
+ + commit 23bfac6d1a8bd2d0af5a6fac3ba3a6e986d6c9e8
+ (cherry picked from commit f9f72ffbfa9fd7d1a7a1823697d116d76155b407)
+
+2017-11-07 Ineiev <ineiev at gnu.org>
+
+ po: Update Russian translation.
+ + commit 1941287c9d2c9e666bad1bd330db169f0e3d6b6c
+
+
+2017-11-07 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+ + commit 96d441b315ec5c9f329596cfda28ac13a8bfa21a
+
+
+2017-11-06 Werner Koch <wk at gnupg.org>
+
+ agent: New GETINFO sub-commands "s2k_count_cal" and "s2k_time".
+ + commit 3607ab2cf382296cb398a92d5ec792239960bf7b
+ * agent/command.c (cmd_getinfo): New sub-commands.
+ * agent/protect.c (get_standard_s2k_count): Factor some code out to ...
+ (get_calibrated_s2k_count): new.
+ (get_standard_s2k_time): New.
+
+ (cherry picked from commit 52d41c8b0f4af6278d18d8935399ddad16a26856)
+
+ agent: New option --s2k-count.
+ + commit 78a6d0ce88ae14d8324fbab3aee3286b17e49259
+ * agent/agent.h (opt): New field 's2k_count'.
+ * agent/gpg-agent.c (oS2KCount): New enum value.
+ (opts): New option --s2k-count.
+ (parse_rereadable_options): Set opt.s2k_count.
+
+2017-11-06 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Unattended key generation "Key-Grip" and "Subkey-Grip".
+ + commit 680161647ad56d1ca92988f80bcc4d6fcb20b1eb
+ * g10/keygen.c (pSUBKEYGRIP): New.
+ (read_parameter_file): Add "Key-Grip" and "Subkey-Grip".
+ (do_generate_keypair): Support pSUBKEYGRIP.
+
+ g10: Simplify "factory-reset" procedure.
+ + commit f183b9768b42a6792c55a6129488bd8fbf5e8e6d
+ * g10/card-util.c (factory_reset): Simplify.
+
+2017-11-02 Ineiev <ineiev at gnu.org>
+
+ po: Update Russian translation.
+ + commit 6070f5a61d4d17ff437c69e1b708d49d107c22dc
+
+
+2017-11-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Introduce magic value 25519 to switch a card to ECC.
+ + commit acb300543422c660c87ac2f0211a42f792a65cc4
+ * g10/card-util.c (ask_card_keyattr): Handle special value 25519.
+ (do_change_keyattr): Allow changing to cv25519/ed25519.
+ (generate_card_keys): Ditto.
+ (card_generate_subkey): Ditto.
+
+ gpg: Rename two card related functions in card-util.
+ + commit de3a740c2e1156e58d2f94faa85c051740c8988e
+ * g10/card-util.c (ask_card_rsa_keysize): Rename to ask_card_keyattr.
+ (do_change_rsa_keysize): Rename to do_change_keyattr.
+
+2017-11-02 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix returning GPG_ERR_NOT_FOUND wrongly.
+ + commit 3da47d19df89d302c0ea25921f4bd8ce55705afe
+ * agent/learncard.c (agent_handle_learn): Find SERIALNO.
+
+2017-11-01 NIIBE Yutaka <gniibe at fsij.org>
+
+ common: Accept the Z-suffix for yymmddThhmmssZ format.
+ + commit 0e5bd473a07f188615c4fce26b73bb452d689d68
+ * common/gettime.c (isotime_p): Accept the Z suffix.
+
+2017-10-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Clean up pinentry access locking.
+ + commit 3924e1442c6625a2b57573a1a634a5ec56b09a29
+ * agent/agent.h (struct server_control_s): Rename PINENTRY_ACTIVE.
+ * agent/call-pinentry.c (entry_owner): Remove.
+ (agent_reset_query): Use thread private object of PINENTRY_ACTIVE.
+ (unlock_pinentry): Add CTRL to arguments to access thread private.
+ Check and decrement PINENTRY_ACTIVE for recursive use.
+ (start_pinentry): Check and increment PINENTRY_ACTIVE for recursion.
+ (agent_askpin): Follow the change of unlock_pinentry API.
+ (agent_get_passphrase, agent_get_confirmation): Likewise.
+ (agent_show_message, agent_popup_message_start): Likewise.
+ (agent_popup_message_stop, agent_clear_passphrase): Likewise.
+
+ agent: Allow recursive use of pinentry.
+ + commit 4738256f2e0d22302377c9ec7b2ae3999338e6c6
+ * agent/agent.h (struct server_control_s): Add pinentry_level.
+ * agent/call-pinentry.c (agent_popup_message_stop): Not clear
+ ENTRY_CTX here.
+ (unlock_pinentry): Handle recursion. Clear ENTRY_CTX here.
+ (start_pinentry): Allow recursive use.
+
+2017-10-26 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent, tests: Support --disable-scdaemon build case.
+ + commit 05cb87276c21c3a47226c75026fa46a955553dd9
+ * agent/command.c (cmd_scd): Support !BUILD_WITH_SCDAEMON.
+ * tests/openpgp/defs.scm (create-gpghome): Likewise.
+ * tests/gpgsm/gpgsm-defs.scm (create-gpgsmhome): Likewise.
+
+ Fix comment of configure.
+ + commit b13972dfbf7224478652038725ab0d2cb41b7303
+ * configure.ac (BUILD_WITH_DIRMNGR): Comment fix.
+
+2017-10-24 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid superfluous sig check info during import.
+ + commit 84af859e391a757877c9a1d78e35face983e6d23
+ * g10/key-check.c (print_info): New.
+ (key_check_all_keysigs): Print sig checking results only in debug
+ mode. Prettify the stats info and suppress them in quiet mode.
+
+ build: New configure option --enable-werror.
+ + commit 812fe29bff42cf7dbd07e0becc55b2ada340dd97
+ * configure.ac: Implement that option.
+
+ build: Do not mess with CFLAGS in configure.
+ + commit e417aaf69817fcb4a73c38077853dc940a2deabc
+ * configure.ac: Do not mess with the user provided CFLAGS.
+
+2017-10-24 Rainer Perske <rainer.perske at uni-muenster.de>
+
+ sm: Do not expect X.509 keyids to be unique.
+ + commit 1067403c8a7fb51decf30059e46901b5ee9f5b37
+ * sm/certlist.c (gpgsm_find_cert): Add arg allow_ambiguous and use it.
+ * sm/call-dirmngr.c (inq_certificate): Pass true to ALLOW_AMBIGUOUS
+ (run_command_inq_cb): Ditto.
+ * sm/gpgsm.c (main): Pass false.
+ * sm/server.c (cmd_passwd): Pass false.
+
+2017-10-24 Werner Koch <wk at gnupg.org>
+
+ gpgconf: Ignore non-installed components with --apply-profile.
+ + commit 6e808ae4700dc5e95bf4cc2d5c063df582c234d0
+ * tools/gpgconf-comp.c (retrieve_options_from_program): Add arg
+ only_installed.
+ (gc_component_retrieve_options): Use this if we want to process all
+ components.
+
+ gpg: Improve the "secret key available" notice in keyedit.c.
+ + commit 560d85ecff4246133d185dc29395f07c918b5556
+ * g10/keyedit.c (KEYEDIT_NEED_SUBSK): New.
+ (cmds): Add this flag to keytocard, bkuptocard, expire, and passwd.
+ (keyedit_menu): Check whether only subkeys are available and take care
+ of that in the command check and in the HELP listing. Also print a
+ different notice if only subkeys are available.
+
+ gpg: Remove unused flags from keyedit.c.
+ + commit 016538d82867c40a21bc7cbf44ec386f4699077f
+ * g10/keyedit.c (KEYEDIT_NOT_SK, KEYEDIT_ONLY_SK): Remove.
+ (cmds): Remove them.
+
+2017-10-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix creating on-disk subkey with on-card primary key.
+ + commit 44fb3fbc85b32552c91f32f099b6b246c12ce0cc
+ * g10/keygen.c (generate_subkeypair): Ignore error code issued for
+ trying to verify a card based key.
+
+ gpg: Print sec/sbb with --import-option import-show or show-only.
+ + commit 2c7dccca9b617780a3ea760adf460bb3b77f90f3
+ * g10/import.c (import_one): Pass FROM_SK to list_keyblock_direct.
+
+ gpg: Make --dry-run and show-only work for secret keys.
+ + commit 68c8619114fd5f24cb6bfb9e0f25c428a8805323
+ * g10/import.c (import_secret_one): Check for dry-run before
+ transferring keys.
+
+2017-10-19 Damien Goutte-Gattat <dgouttegattat at incenp.org>
+
+ dirmngr: Do not follow https-to-http redirects.
+ + commit 1ba308aa0356a57c21c4c8c2dac75b4d62b8aac3
+ * dirmngr/ks-engine-http.c (ks_http_fetch): Forbid redirects from
+ a https URI to a http URI.
+
+2017-10-19 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Fix find_and_check_key for multiple keyrings.
+ + commit d07de3862710d88bc80d6f6c5ca8da5cf38ff0eb
+ * g10/pkclist.c (find_and_check_key): Call get_validity on a specific
+ keyblock.
+
+2017-10-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Keep a lock during the read-update/insert cycle in import.
+ + commit 7c73db3d31c6457dfbdc82a8dc89951c023f0603
+ * g10/keydb.c (keydb_handle): New field 'keep_lock'.
+ (keydb_release): Clear that flag.
+ (keydb_lock): New function.
+ (unlock_all): Skip if KEEP_LOCK is set.
+ * g10/getkey.c (get_keyblock_byfprint_fast): Call keep_lock if
+ requested.
+
+ gpg: Improve keydb handling in the main import function.
+ + commit 8448347b5bdee56e6f9938a93ea92fe4d3c8800c
+ * g10/getkey.c (get_pubkey_byfprint_fast): Factor most code out to ...
+ (get_keyblock_byfprint_fast): .. new function.
+ * g10/import.c (revocation_present): s/int rc/gpg_error_t err/.
+ (import_one): Use get_keyblock_byfprint_fast to get the keyblock and a
+ handle. Remove the now surplus keyblock fetch in the merge branch.
+
+ gpg: Simplify keydb handling of the main import function.
+ + commit 752cae6dd2ee8982a34c796a3f168ae538f7938c
+ * g10/import.c (import_keys_internal): Return gpg_error_t instead of
+ int. Change var names.
+ (import_keys_es_stream): Ditto.
+ (import_one): Ditto. Use a single keydb_new and simplify the use of
+ of keydb_release.
+
+ sm: Fix colon listing of fields > 12 in crt records.
+ + commit 1bf5cbd3ef01b7f5fdcfa30c882047b924dcf3f0
+ * sm/keylist.c (print_capabilities): Move colon printing ...
+ (list_cert_colon): to here.
+
+2017-09-28 Werner Koch <wk at gnupg.org>
+
+ gpg: Workaround for junk after --trusted-key.
+ + commit b509d81cab030cca6abf0d878e1fc884eda344e6
+ * g10/trust.c (register_trusted_key): Cut off everthing starting as a
+ hash sign.
+
+2017-09-19 Werner Koch <wk at gnupg.org>
+
+ Release 2.2.1.
+ + commit 355ca9e9498740fb6294eec451507b4891ae01ec
+
+
+2017-09-18 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Use system certs if --hkp-cacert is not used.
+ + commit df692a6167be5486f9a29da003a00292fd895176
+ * dirmngr/certcache.c (any_cert_of_class): New var.
+ (put_cert): Set it.
+ (cert_cache_deinit): Clear it.
+ (cert_cache_any_in_class): New func.
+ * dirmngr/http-ntbtls.c (gnupg_http_tls_verify_cb): Add hack to
+ override empty list of HKP certs.
+
+ wks: Create a new user id if provider wants mailbox-only.
+ + commit 50c8b6c88f5d9f4b6c4e9c03aee31fe29afa94b8
+ * tools/gpg-wks-client.c (get_key): Add arg 'exact'.
+ (add_user_id): New.
+ (command_send): Create new user id.
+
+ wks: Send only the newest UID to the server.
+ + commit 7f7f5d06fa5aa3a3c5ab8d2e59ee76207bfdeaa0
+ * tools/wks-util.c (list_key_status_cb): Rename to key_status_cb.
+ (wks_filter_uid): New.
+ (wks_list_key): Allow FPR to be NULL. Return an error if no
+ fingerprint was found.
+ * tools/gpg-wks-server.c (process_new_key)
+ (check_and_publish): Remove now useless extra check for FPR.
+ * tools/gpg-wks-client.c (command_check): Ditto.
+ (command_send): Filter out the newest uid.
+
+ wks: Print the UID creation time with gpg-wks-client --check.
+ + commit a0035986a8615df056182bb9af775b8b7b22003d
+ * tools/gpg-wks.h (uidinfo_list_s): Add field 'created'.
+ * tools/wks-util.c (append_to_uidinfo_list): Add arf 'created'.
+ (wks_list_key): Pass timestamp to append_to_uidinfo_list.
+ * tools/gpg-wks-client.c (command_check): Print UID creation time.
+
+ wks: Use dedicated type to convey user ids.
+ + commit 4e0696de897cac6a34d55a69d8889faf26f1a923
+ * tools/gpg-wks.h (uidinfo_list_s, uidinfo_list_t): New.
+ * tools/wks-util.c (append_to_uidinfo_list): New.
+ (free_uidinfo_list): New.
+ (wks_list_key): Change arg r_mboxes to uidinfo_list_t. Use
+ append_to_uidinfo_list.
+ * tools/gpg-wks-server.c (sserver_ctx_s): Replace strlist_t by
+ uidinfo_list_t.
+ (process_new_key): Ditto.
+ (check_and_publish): Ditto.
+ (command_receive_cb): Replace free_strlist by free_uidinfo_list.
+ * tools/gpg-wks-client.c (command_check): Replace strlist_t by
+ uidinfo_list_t. Also print user id in verbose mode.
+
+2017-09-13 Werner Koch <wk at gnupg.org>
+
+ gpgv: Initialize compliance checker.
+ + commit 006ca124ed95845d43af8c14d7ab2bc085b47b4c
+ * g10/gpgv.c (main): Call gnupg_initialize_compliance.
+
+2017-09-12 Werner Koch <wk at gnupg.org>
+
+ wks: Add hack for the broken posteo system.
+ + commit a821b4f5567d02c3329c2b94a73dcbe12e6699a2
+ * tools/gpg-wks-client.c (command_send): Additional hack for posteo.
+ Check the protocol-version flag.
+
+ wks: Add new policy flag protocol-version.
+ + commit 332c9eaa2a3c7cae90b389cdaa2c149c5595fb4d
+ * tools/gpg-wks.h (policy_flags_s): Add field protocol_version.
+ * tools/wks-util.c (wks_parse_policy): Add new policy flag.
+
+ gpg: Fix "Fix key generation with only an email part".
+ + commit 8b5a2474f21dd4f1aa2a283e2f57d75e42742af5
+ * g10/keygen.c (proc_parameter_file): Don't check the result of
+ stpcpy.
+
+ wks: Use unencrypted draft-1 mode for posteo.de.
+ + commit c65a7bba7331975d20910f90cf648b6ecc5410f0
+ * tools/gpg-wks-client.c (command_send): Allow sending in draft-1
+ mode.
+
+ tools: New function mime_maker_add_body_data.
+ + commit 7d15ee88980f88ca62fc7de9492dd08e54d0f0f1
+ * tools/mime-maker.c (mime_maker_add_body_data): New.
+
+2017-09-11 NIIBE Yutaka <gniibe at fsij.org>
+
+ tests: Fix a test which specifies expiration date.
+ + commit a172759b5088ae086c0caa2e7d4d0ea346b28a90
+ * tests/openpgp/quick-key-manipulation.scm: Fix expiration time
+ comparison.
+
+ scd: Fix for large ECC keys.
+ + commit 827abe01a72a50eab1cdcde78985b42a4a8480fb
+ * scd/app-openpgp.c (do_decipher): Support larger length.
+
+2017-09-11 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix key generation with only an email part.
+ + commit 7089dcc54099a4909ce7d386c07ab87e1398e2eb
+ * g10/keygen.c (proc_parameter_file): Special case the email only
+ case.
+
+2017-08-28 Werner Koch <wk at gnupg.org>
+
+ Release 2.2.0.
+ + commit 9d80fb8e000189e61c173c39f1e1ca417566a7fc
+
+
+2017-08-27 Werner Koch <wk at gnupg.org>
+ Arnaud Fontaine <arnaud.fontaine at ssi.gouv.fr>
+
+ scd: Convey the correct length for Le.
+ + commit 45d5f5800afe6613f338a26f361cb5e03e861129
+ * scd/app-openpgp.c (determine_rsa_response): Round bits up.
+
+2017-08-24 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix memory leak while running --check-trustdb.
+ + commit 13821e15fb9bdddfce79d88731c0f151724b2371
+ * g10/trustdb.c (update_min_ownertrust): Free PK.
+
+ gpg: Fix memory leak in sig-check.
+ + commit b065a696344eac3007dbd5642143ecaaeebab43a
+ * g10/sig-check.c (check_signature_over_key_or_uid): Remove useless
+ condition. Actually free when SIGNER was allocated by us.
+
+ build: Remove obsolete option from autogen.rc.
+ + commit 02a5df614a369519ad7781f95dc977e24a0d4277
+ * autogen.rc: Remove --enable-gpg2-is-gpg.
+
+2017-08-23 Werner Koch <wk at gnupg.org>
+
+ gpgconf: Swap "auto-key-retrieve" and "no-auto-key-retrieve".
+ + commit 565e486b8028f9e3cc51ebc5202666b598042175
+ * g10/gpg.c (gpgconf_list): Announce "auto-key-retrieve".
+ (main): Simplify setting of KEYSERVER_AUTO_KEY_RETRIEVE.
+ * tools/gpgconf-comp.c: Make "no-auto-key-retrieve" invisible. Make
+ "auto-key-retrieve" an expert option.
+
+ tests: Do not run trust-pgp-4.scm.
+ + commit b917cb66b79597520788cd9264889942247a3377
+ * tests/openpgp/Makefile.am (XTESTS): Remove test.
+ (EXTRA_DIST): Add test file.
+
+ build: Change SWDB tag "gnupg21" to "gnupg22".
+ + commit 008ae0bd868cb49ad4d67fc8c71707cd2a162137
+ * configure.ac (GNUPG_SWDB_TAG): New ac_define. Set it to "gnupg22".
+ * tools/gpgconf.c (query_swdb): Use it.
+ * build-aux/speedo.mk: Change tag "gnupg21" to "gnupg22".
+ * Makefile.am (distcheck-hook): Ditto.
+
+2017-08-23 Åka Sikrom <a4 at hush.com>
+
+ po: Update Norwegian translation.
+ + commit fd0e5b60bed1cfc2aed7b2e13cc449f355eac051
+
+
+2017-08-23 Andre Heinecke <aheinecke at intevation.de>
+
+ agent: Fix string translation for Windows.
+ + commit 6158811304937b592601ef30c29c5a5cdbaa88ea
+ * agent/agent.h (L_): Define agent_Lunderscore when simple
+ gettext is used.
+
+2017-08-22 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+ + commit e6fa6b0ce823effd721c807b2b292287af91c642
+
+
+2017-08-21 Damien Goutte-Gattat <dgouttegattat at incenp.org>
+
+ tests: Add tests for the PGP trust model.
+ + commit c23a69970ba38edae9d3b2603825d18fbb732423
+ * tests/openpgp/trust-pgp-1.scm: New file.
+ * tests/openpgp/trust-pgp-2.scm: New file.
+ * tests/openpgp/trust-pgp-3.scm: New file.
+ * tests/openpgp/trust-pgp-4.scm: New file.
+ * tests/openpgp/trust-pgp/common.scm: New file.
+ * tests/openpgp/trust-pgp/scenario1.asc: New file.
+ * tests/openpgp/trust-pgp/scenario2.asc: New file.
+ * tests/openpgp/trust-pgp/scenario3.asc: New file.
+ * tests/openpgp/trust-pgp/scenario4.asc: New file.
+ * tests/openpgp/trust-pgp/alice.sec.asc: New file.
+ * tests/openpgp/trust-pgp/bobby.sec.asc: New file.
+ * tests/openpgp/trust-pgp/carol.sec.asc: New file.
+ * tests/openpgp/trust-pgp/david.sec.asc: New file.
+ * tests/openpgp/trust-pgp/frank.sec.asc: New file.
+ * tests/openpgp/trust-pgp/grace.sec.asc: New file.
+ * tests/openpgp/trust-pgp/heidi.sec.asc: New file.
+ * tests/openpgp/Makefile.am (XTESTS): Add new tests.
+ (TEST_FILES): Add new files.
+ (EXTRA_DIST): Add new common file.
+
+ tests: Move some functions into a common module.
+ + commit cbe54b28bf3610204e12c50c0606df37337a1156
+ * tests/openpgp/tofu.scm (gettrust): Moved to the common defs.scm
+ module.
+ (checktrust): Likewise.
+ * tests/openpgp/defs.scm (gettrust): New function.
+ (checktrust): Likewise.
+
+ gpgconf: Make WoT settings configurable by gpgconf.
+ + commit 0161225457e0609509d0d5f4b80a60a1071b4b48
+ * tools/gpgconf-comp.c (gc_options_gpg): Add max-cert-depth,
+ completes-needed, and marginals-needed options.
+ * g10/gpg.c (gpgconf_list): Likewise.
+
+2017-08-21 Justus Winter <justus at g10code.com>
+
+ gpgscm: Fix -Wimplicit-fallthrough warnings.
+ + commit 6e596b2a745ae7a75a69038cf00ab4bbae1cebaa
+ * tests/gpgscm/scheme.c (CASE): Rearrange so that the case statement
+ is at the front.
+ (Eval_Cycle): Improve fallthrough annotations.
+
+2017-08-11 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: default to --no-auto-key-retrieve.
+ + commit e6f84116abca2ed49bf14b2e28c3c811a3717227
+ * g10/gpg.c (main): remove KEYSERVER_AUTO_KEY_RETRIEVE from the
+ default keyserver options.
+ * doc/gpg.texi: document this change.
+
+2017-08-10 Justus Winter <justus at g10code.com>
+
+ tests: Improve documentation.
+ + commit 23107ba20f8b4eb5482b480ad6a8af6b39d2bfeb
+ * tests/openpgp/README: Add quickstart instructions, how to use
+ shell.scm, remove no longer used MKDATA.
+
+2017-08-09 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
+
+ g10: Write status error on error of --quick-revoke-uid.
+ + commit 977fc5f0eb9fdee19e66bea8cd2eb5414789b485
+ * g10/keyedit.c (keyedit_quick_revuid): Write status error on error.
+
+2017-08-09 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.23.
+ + commit e8ffa9a6ca5d76660b67207cd1157068e48483de
+
+
+ po: Update German translation.
+ + commit 2059dbf201963c6f229698ae80c6c774b1f686c8
+
+
+2017-08-08 Werner Koch <wk at gnupg.org>
+
+ build: New configure option --enable-all-tests.
+ + commit fb21aa8b50367e2afa13bad73fc21d6f01a97e18
+ * configure.ac: New option --enable-all-tests.
+ * tests/gpgscm/ffi.c (ffi_init): New gloabl var *run-all-tests*.
+ * tests/openpgp/all-tests.scm (all-tests): Use that var instead
+ of *maintainer-mode*.
+ * Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Add --enable-all-tests.
+
+ gpgscm: Make the test summary stand out.
+ + commit 0bd19dae1161a71053d794e4f75e66f70445f9f0
+ * tests/gpgscm/tests.scm (test-pool): Add delimiter lines.
+
+ sm: Always print the keygrip in colon mode.
+ + commit 0a8e20c4c639f0c491e2af5ac5fb97005196422b
+ * sm/keylist.c (list_cert_colon): Always print the keygrip as
+ described in the manual.
+
+2017-08-08 Justus Winter <justus at g10code.com>
+
+ gpg: Add option '--disable-dirmngr'.
+ + commit c4506f624ed6854aa0ba1629aa2d1d43eb26900d
+ * doc/gpg.texi: Document new option.
+ * g10/call-dirmngr.c (create_context): Fail if option is given.
+ * g10/gpg.c (cmd_and_opt_values): New value.
+ (opts): New option.
+ (gpgconf_list): Add new option.
+ (main): Handle new option.
+ * g10/options.h (struct opt): New field 'disable_dirmngr'.
+ * tools/gpgconf-comp.c (gc_options_gpg): New option.
+
+2017-08-07 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ systemd-user: Drop redundant After=*.socket.
+ + commit 81074c3b0211854a2dc94600dc892224201536f5
+ * doc/examples/systemd-user/*.service: Drop redundant After=*.socket
+ directive.
+
+ systemd-user: Drop RefuseManualStart=true.
+ + commit 407da18254dfebcacfaee16952ef0b617b1626ea
+ * doc/examples/systemd-user/*.service: drop RefuseManualStart=true
+
+2017-08-07 Justus Winter <justus at g10code.com>
+
+ tests: Do not run all tests unless in maintainer mode.
+ + commit b0112dbca91e720a4ff622ad0e88d99eba56203a
+ * configure.ac: Leak the maintainer mode flag into 'config.h'.
+ * tests/gpgscm/ffi.c: Pass it into the scheme environment.
+ * tests/openpgp/all-tests.scm: Only run tests against non-default
+ configurations (keyring, extended-key-format) in maintainer mode.
+
+2017-08-07 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ Fix spelling.
+ + commit a611cba142470c52f3303c512f77ae7d195cc41f
+ * doc/gpg.texi: s/occured/occurred/
+
+ Simple typo fix.
+ + commit f011d8763a009612c858a287cf7cc6a1f1a6d32a
+ * agent/gpg-agent.c: Correct spelling in comment.
+
+2017-08-05 Werner Koch <wk at gnupg.org>
+
+ gpg: Install gpg by default under the name gpg.
+ + commit a69464b0b6dac88b360a13d3faf19dd7f2a0e02b
+ * configure.ac: Remove option --enable-gpg2-is-gpg. Add option
+ --enable-gpg-is-gpg2.
+ * build-aux/speedo.mk (speedo_pkg_gnupg_configure): Remove
+ --enable-gpg2-is-gpg.
+
+ gpg: gpgconf needs to support the now default --auto-key-retrieve.
+ + commit 69e97d909d586160cc0631c9a6f4d3f24bb0c682
+ * tools/gpgconf-comp.c (gc_options_gpg): Re-add "auto-key_retrieve".
+
+2017-08-04 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix memory leak in parse_auto_key_locate.
+ + commit b70e86fd1050fc6da07a177ed142ae9882b4dd0d
+ * g10/getkey.c (parse_auto_key_locate): Fix freeing of OPTIONS.
+
+ tests: Adjust tests for changed --auto-key-locate default.
+ + commit 0767eada1479c0fa9d4b75781a8c2afb67bdbf90
+ * tests/openpgp/defs.scm (create-gpghome): Disable new defaults.
+
+ gpg: Make --no-auto-key-retrieve gpgconf-igurable.
+ + commit 9bb13a0e819334681caca38c9074bd7bfc04e45e
+ * g10/gpg.c (gpgconf_list): Print no-auto-key-retrieve instead of
+ auto-key-retrieve.
+ * tools/gpgconf-comp.c (gc_options_gpg): Replace auto-key-retrieve by
+ no-auto-key-retrieve and chnage level from invisible to advanced.
+
+ gpg: Default to --auto-key-locate "local,wkd" and --auto-key-retrieve.
+ + commit 7e1fe791d188b078398bf83c9af992cb1bd2a4b3
+ * g10/gpg.c (main): Add KEYSERVER_AUTO_KEY_RETRIEVE to the default
+ keyserver options. Set the default for --auto-key-locate to
+ "local,wkd". Reset that default iff --auto-key-locate has been given
+ in the option file or in the commandline.
+ * g10/getkey.c (parse_auto_key_locate): Work on a copy of the arg.
+
+ agent: Make --no-grab the default.
+ + commit 3d78ae4d3de08398fabae5821045a3a1da6dadbe
+ * agent/gpg-agent.c (oGrab): New const.
+ (opts): New option --grab. Remove description for --no-grab.
+ (parse_rereadable_options): Make --no-grab the default.
+ (finalize_rereadable_options): Allow --grab to override --no-grab.
+ (main) <gpgconflist>: Add "grab".
+ * tools/gpgconf-comp.c (gc_options_gpg_agent): Add "grab".
+
+ gpg: Avoid double fingerprint printing with import-show.
+ + commit b54d75fb1dcfa2cebb3a2497b81ffb49acac2056
+ * g10/import.c (import_one) <IMPORT_SHOW>: Take care of fingerprint
+ options.
+
+ gpg: New import option show-only.
+ + commit d9fabcc1989d7235ea0294874803295a30f8711b
+ * g10/options.h (IMPORT_DRY_RUN): New.
+ * g10/import.c (parse_import_options): Add "show-only".
+ (import_one): use that as alternative to opt.dry_run.
+
+2017-08-03 Werner Koch <wk at gnupg.org>
+
+ wks: Allow gpg-wks-client --supported with just the domain name.
+ + commit 6cba56d436b56ea5e60042144a8a75a2e80007c8
+ * tools/gpg-wks-client.c (command_supported): Hack for missing local
+ part.
+
+2017-08-02 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
+
+ g10: Always save standard revocation certificate in file.
+ + commit dcfb01959802b27869528dda1d9a4f5e79574bb5
+ * g10/revoke.c (gen_standard_revocation): Set opt.outfile to NULL
+ temporarily to create certificate in right place.
+
+2017-08-01 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
+
+ Revert "g10: Always save standard revocation certificate in file."
+ + commit 624cd2d0bf6cc6dd1b79654295dc76f5b2d6d70b
+ This reverts commit ebc65ff459e6c228fb7406e375819a9fe5637abe.
+
+ g10: Always save standard revocation certificate in file.
+ + commit ebc65ff459e6c228fb7406e375819a9fe5637abe
+ * g10/main.h (open_outfile): New parameter NO_OUTFILE.
+ * g10/openfile.c (open_outfile): New parameter NO_OUTFILE. If given,
+ never use opt.outfile.
+ * g10/revoke.c (create_revocation): If FILENAME is true, also set
+ NO_OUTFILE to true (for standard revocation certificates).
+ * g10/dearmor.c, g10/encrypt.c, g10/export.c, g10/revoke.c,
+ g10/sign.c: Adjust all other callers.
+
+ artwork: Add icons.
+ + commit a8d0b8d2333ddab703d1e346e06c106eeeedfd53
+ * artwork/icons/index.css: New file.
+ * artwork/icons/index.html: New file.
+ * artwork/icons/lock-12.png: New file.
+ * artwork/icons/lock-128.png: New file.
+ * artwork/icons/lock-16.png: New file.
+ * artwork/icons/lock-24.png: New file.
+ * artwork/icons/lock-256.png: New file.
+ * artwork/icons/lock-32.png: New file.
+ * artwork/icons/lock-48.png: New file.
+ * artwork/icons/lock-64.png: New file.
+ * artwork/icons/lock-wing-12.png: New file.
+ * artwork/icons/lock-wing-128.png: New file.
+ * artwork/icons/lock-wing-16.png: New file.
+ * artwork/icons/lock-wing-24.png: New file.
+ * artwork/icons/lock-wing-256.png: New file.
+ * artwork/icons/lock-wing-32.png: New file.
+ * artwork/icons/lock-wing-48.png: New file.
+ * artwork/icons/lock-wing-64.png: New file.
+ * artwork/icons/lock-wing.svg: New file.
+ * artwork/icons/lock.svg: New file.
+ * artwork/icons/wing-12.png: New file.
+ * artwork/icons/wing-128.png: New file.
+ * artwork/icons/wing-16.png: New file.
+ * artwork/icons/wing-24.png: New file.
+ * artwork/icons/wing-256.png: New file.
+ * artwork/icons/wing-32.png: New file.
+ * artwork/icons/wing-48.png: New file.
+ * artwork/icons/wing-64.png: New file.
+ * artwork/icons/wing.svg: New file.
+
+2017-08-01 Werner Koch <wk at gnupg.org>
+
+ gpg,sm: Error out on compliance mismatch while decrypting.
+ + commit 4e117f206beb38287ddcd3251fb7baabadfbddbb
+ * g10/pubkey-enc.c (get_session_key): Bail out if the algo is not
+ allowed in the current compliance mode.
+ * sm/decrypt.c (gpgsm_decrypt): Ditto.
+
+2017-08-01 NIIBE Yutaka <gniibe at fsij.org>
+
+ Simple typo fix.
+ + commit fde9a8cc6c849fb21f3e6782dbd5c6bc863357eb
+ * tools/rfc822parse.c: Fix.
+
+ po: Update Japanese translation.
+ + commit 02b571947b9442604faa7509478cd8577c2c0b9c
+
+
+2017-07-31 Werner Koch <wk at gnupg.org>
+
+ dirmngr,w32: Fix http connection timeout problem.
+ + commit 482fd5758c1b7e1b33c4cb50656e586a3ae16815
+ * dirmngr/http.c (connect_with_timeout) [W32]: Take care of EAGAIN.
+
+ Explain the "server is older than xxx warning".
+ + commit 4ad5bc1b6d72483123963c894ee1412b2ceb99b4
+ * g10/call-agent.c (warn_version_mismatch): Print a note on how to
+ restart the servers.
+ * g10/call-dirmngr.c (warn_version_mismatch): Ditto.
+ * sm/call-agent.c (warn_version_mismatch): Ditto.
+ * sm/call-dirmngr.c (warn_version_mismatch): Ditto.
+
+2017-07-28 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.22.
+ + commit 7d335ff496b129ee6f33c4ca25bd7a6631a4b590
+
+
+ po: Update German translation.
+ + commit 339f672dad94b4e0000fd2d3a1f272a4861c91c3
+
+
+ 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 5859406,0000000..530cdd9
mode 100644,000000..100644
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,0 +1,1 @@@
- 2.2.3
++2.2.4
diff --cc doc/defsincdate
index 76eff8c,0000000..32ccdab
mode 100644,000000..100644
--- a/doc/defsincdate
+++ b/doc/defsincdate
@@@ -1,1 -1,0 +1,1 @@@
- 1510737437
++1513615565
diff --cc po/ca.po
index e0d2d86,a65380c..7757513
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2005-02-04 02:04+0100\n"
"Last-Translator: Jordi Mallach <jordi at gnu.org>\n"
"Language-Team: Catalan <ca at dodds.net>\n"
@@@ -177,26 -148,11 +177,26 @@@ msgstr "la contrasenya és errònia
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "l'algoritme de protecció %d%s no està suportat\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -404,8 -321,6 +404,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "canvia la contrasenya"
- #: agent/gpg-agent.c:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -415,131 -330,99 +415,131 @@@ msgstr "
"Opcions:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, 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:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "detall"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "una mica més silenciós"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 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:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualitza la base de dades de confiança"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, 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:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "error en la creació de la contrasenya: %s\n"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
#, fuzzy
msgid "allow presetting passphrase"
msgstr "error en la creació de la contrasenya: %s\n"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
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:241
++#: agent/gpg-agent.c:243
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "no és suportat"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
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:246
++#: agent/gpg-agent.c:248
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -548,167 -431,119 +548,162 @@@ msgstr "no és suportat
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
#, 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:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "l'algorisme de resum seleccionat no és vàlid\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 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:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, 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:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, fuzzy, c-format
msgid "socket name '%s' is too long\n"
msgstr "Certificat de revocació vàlid"
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
#, 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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "error en crear «%s»: %s\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, 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:2241 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:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, 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:2327
++#: agent/gpg-agent.c:2351
#, 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:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, 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:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2771
++#: agent/gpg-agent.c:2795
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, 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:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu claus es descarta\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
@@@ -724,8 -557,6 +719,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -733,9 -564,6 +728,9 @@@ msgstr "
"@Ordres:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -789,8 -609,6 +784,8 @@@ msgstr "Cancel·la
msgid "error while asking for the passphrase: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "error en la lectura de «%s»: %s\n"
@@@ -976,8 -759,6 +971,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
@@@ -1479,7 -1162,6 +1474,7 @@@ msgstr "
# Probablement és una clau, femení. jm
# Werner FIXME: please add translator comment saying *what* is
# uncompressed so we know the gender. jm
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
#, fuzzy
msgid "out of core\n"
msgstr "no forçat"
@@@ -1538,8 -1209,6 +1533,8 @@@ msgstr "no s'ha trobat la clau públic
msgid "waiting for lock %s...\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1732,8 -1364,6 +1727,8 @@@ msgstr "
# Destès? ivb
# Desatès, sí. jm
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "no es pot fet això en mode desatès\n"
@@@ -1749,10 -1377,6 +1744,10 @@@ msgstr "Aquesta ordre no està permesa
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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "La vostra selecció? "
@@@ -1814,17 -1425,11 +1809,17 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "no hi ha cap clau pública corresponent: %s\n"
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, 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:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
@@@ -1881,7 -1475,6 +1876,7 @@@ msgstr "La generació de claus ha falla
msgid "not an OpenPGP card"
msgstr "no s'han trobat dades OpenPGP vàlides.\n"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, 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"
@@@ -1917,13 -1504,10 +1912,13 @@@ msgstr "Quina grandària voleu? (1024)
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr ""
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: 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:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1977,9 -1551,6 +1972,9 @@@ msgstr " (%d) RSA (només xifrar)\n
msgid " (3) Authentication key\n"
msgstr ""
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "La selecció és invàlida.\n"
@@@ -2120,22 -1661,14 +2115,22 @@@ msgstr "--output no funciona per a aque
msgid "can't open '%s'\n"
msgstr "no s'ha pogut obrir «%s»\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 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"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "no s'ha trobat la clau «%s»: %s\n"
@@@ -2233,8 -1748,6 +2228,8 @@@ msgid "
msgstr ""
"forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, 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"
@@@ -2264,7 -1773,6 +2259,7 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s xifrat per a: «%s»\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2394,29 -1878,23 +2389,29 @@@ msgstr "%s: es descarta: %s\n
msgid "writing to '%s'\n"
msgstr "s'està escrivint en «%s»\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, 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:1904
++#: g10/export.c:1909
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "AVÍS: no s'ha exportat res\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2427,13 -1904,10 +2422,13 @@@ msgstr "error en crear «%s»: %s\n
msgid "[User ID not found]"
msgstr "[No s'ha trobat l'id d'usuari]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2443,61 -1916,50 +2438,61 @@@
msgid "error looking up: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "error en crear l'anell «%s»: %s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "error en crear «%s»: %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "error en crear «%s»: %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
#, fuzzy
msgid "No fingerprint"
msgstr "Empremta digital:"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOM|usa NOM com a clau secreta predeterminada"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOM|usa NOM com a clau secreta predeterminada"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, 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/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "opcions d'importació no vàlides\n"
@@@ -2709,7 -2125,6 +2704,7 @@@ msgstr "usa el mode de text canònic
msgid "|FILE|write output to FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "no fa cap canvi"
@@@ -3111,7 -2453,6 +3106,7 @@@ msgstr "%s:%d opcions d'exportació no
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "AVÍS: el programa podria crear un fitxer core!\n"
@@@ -3132,7 -2470,6 +3127,7 @@@ msgstr "%s no és permés amb %s!\n
msgid "%s makes no sense with %s!\n"
msgstr "%s no té sentit amb %s!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr ""
@@@ -3141,7 -2477,6 +3136,7 @@@
msgid "will not run with insecure memory due to %s\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
- #: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
@@@ -3208,8 -2529,6 +3203,8 @@@ msgstr "les preferències personals de
msgid "%s does not yet work with %s\n"
msgstr "%s encara no funciona amb %s\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
@@@ -3339,7 -2632,6 +3334,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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|escriu informació d'estat en aquest FD"
@@@ -4748,7 -3766,6 +4743,7 @@@ msgstr "Esteu segur que encara voleu af
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr ""
@@@ -5062,54 -4018,42 +5057,54 @@@ msgstr "hi ha massa preferències «%c�
msgid "too many compression preferences\n"
msgstr "hi ha massa preferències «%c»\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "s'està escrivint una signatura directa\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "s'està escrivint l'autosignatura\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "s'està escrivint la signatura de comprovació de la clau\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
#, fuzzy
msgid "Sign"
msgstr "sign"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
#, fuzzy
msgid "Encrypt"
msgstr "xifra dades"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr ""
@@@ -5123,157 -4067,126 +5118,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr ""
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Seleccioneu quin tipus de clau voleu:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA i ElGamal (predeterminat)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA i ElGamal (predeterminat)\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (només signar)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (només signar)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (només xifrar)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (només xifrar)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (només signar)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (només xifrar)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA i ElGamal (predeterminat)\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (només signar)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) DSA (només signar)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (només xifrar)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (només xifrar)\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Notació de signatura: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "No hi ha cap ID amb l'índex %d\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "arrodonida fins a %u bits\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Quina grandària voleu? (1024) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Quina grandària voleu? (1024) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "La grandària sol·licitada és %u bits\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Seleccioneu quin tipus de clau voleu:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5289,7 -4202,6 +5284,7 @@@ msgstr "
" <n>m = la clau caduca als n mesos\n"
" <n>y = la clau caduca als n anys\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5305,42 -4217,34 +5300,42 @@@ msgstr "
" <n>m = la signatura caduca als n mesos\n"
" <n>y = la signatura caduca als n anys\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "Indiqueu la validesa de la clau (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Indiqueu la validesa de la signatura (0) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "el valor no és vàlid\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s no caduca en absolut\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s no caduca en absolut\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s caduca el %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Aquesta signatura caduca el %s\n"
# Amb «it» es refereix a les dates? ivb
# Això vaig entendre jo. jm
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5348,12 -4252,10 +5343,12 @@@ msgstr "
"El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
"Tanmateix, les tractarà bé fins l'any 2106.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "És correcte? (s/n)"
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5364,7 -4266,6 +5359,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
#, fuzzy
msgid ""
"\n"
@@@ -5381,50 -4282,39 +5376,50 @@@ msgstr "
" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Nom i cognoms: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "El nom no pot començar amb un dígit\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "El nom ha de tenir, si més no, 5 caràcters\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "Adreça electrònica: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "No és una adreça vàlida\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Comentari: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Esteu usant el joc de caràcters `%s'.\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5435,7 -4325,6 +5430,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
@@@ -5452,35 -4341,28 +5447,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoXx"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Corregiu l'error primer\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
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"
@@@ -5492,13 -4374,10 +5487,13 @@@ msgstr "
"nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
"d'aconseguir prou entropia.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "La generació de claus ha fallat: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5506,69 -4385,56 +5501,69 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "«%s» ja està comprimida\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "Voleu crear la clau de tota manera? "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "Voleu crear la clau de tota manera? "
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "La generació de claus ha estat cancel·lada.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr ""
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "s'està escrivint la clau pública a «%s»\n"
# Potser no hi haja cap anell! ivb
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "no s'ha trobat cap anell públic escrivible: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
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:4837
++#: g10/keygen.c:4859
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5578,7 -4444,6 +5573,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:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5587,7 -4452,6 +5582,7 @@@ msgstr "
"amb el rellotge)\n"
# Werner FIXME: use ngettext. jm
- #: g10/keygen.c:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5595,22 -4459,18 +5590,22 @@@ msgstr "
"la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
"amb el rellotge)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
#, 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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
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:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
#, 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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crear realment? "
@@@ -6368,23 -5082,18 +6363,23 @@@ msgstr "És aquesta foto correcta (s/N/
msgid "unable to display photo ID!\n"
msgstr "no s'ha pogut mostrar el photo ID!\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "No s'ha especificat cap raó"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "La clau ha estat substituïda"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "La clau ha estat compromesa"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "La clau ja no s'usa"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "L'ID d'usuari ja no és vàlid"
@@@ -6466,7 -5162,6 +6461,7 @@@ msgid "
"\n"
msgstr ""
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "La vostra decisió? "
@@@ -6618,46 -5285,37 +6613,46 @@@ msgstr "AVÍS: Aquesta clau no ve certi
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr "No és segur que la signatura pertanya al seu propietari.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: es descarta: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: es descarta: la clau pública està desactivada\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: es descarta: la clau pública ja està present\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "no s'ha pogut connectar amb «%s»: %s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "l'algoritme de dispersió és invàlid «%s»\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "l'algoritme de dispersió és invàlid «%s»\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "No heu especificat un ID d'usuari. (podeu usar «-r»)\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6665,37 -5323,29 +6660,37 @@@ msgstr "
"\n"
"Introduïu l'ID d'usuari. Finalitzeu amb una línia en blanc: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Usuari inexistent.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "es descarta: la clau pública ja s'ha especificat com a destinatari\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "La clau pública està desactivada.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "es descarta: la clau pública ja està establida\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "no hi ha adreces vàlides\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "clau %08lX: sense ID\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "clau %08lX: sense ID\n"
@@@ -6804,7 -5432,6 +6799,7 @@@ msgstr "La clau secreta està disponibl
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "s'ha forçat l'eixida d'armadura ASCII.\n"
@@@ -6822,19 -5446,16 +6817,19 @@@ msgstr "S'ha creat el certificat de rev
msgid "no revocation keys found for \"%s\"\n"
msgstr "no s'han ttrobat claus de revocació per a «%s»\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6843,20 -5464,17 +6838,20 @@@
"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:577
++#: g10/revoke.c:590
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "S'ha creat el certificat de revocació.\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
@@@ -6864,23 -5482,19 +6859,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "error en crear l'anell «%s»: %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6899,34 -5513,27 +6894,34 @@@ msgstr "
"d'impressió de la vostra màquina podria emmagatzemar les dades i fer-les\n"
"disponibles a altres!\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Seleccioneu la raó de la revocació:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Cancel·la"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Segurament voleu seleccionar %d ací)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr ""
"Introduïu una descripció opcional; finalitzeu amb una línia en blanc:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Raó de la revocació: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(No es va donar una descripció)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "És açò correcte? "
@@@ -7350,10 -5883,6 +7345,10 @@@ msgstr "error en la creació de la cont
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
@@@ -7385,7 -5909,6 +7380,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
@@@ -7698,18 -6172,14 +7693,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7777,7 -6235,6 +7772,7 @@@ msgstr "
"no és necessària una comprovació de la base de dades de confiança\n"
"\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "la pròxima comprovació de la base de dades de confiança serà el %s\n"
@@@ -7809,14 -6261,12 +7804,14 @@@ msgstr "si us plau, feu un --check-trus
msgid "checking the trustdb\n"
msgstr "s'està comprovant la base de dades de confiança\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "fins ara s'han processat %lu claus\n"
msgstr[1] "fins ara s'han processat %lu claus\n"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7824,23 -6274,19 +7819,23 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
msgstr[1] "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "no s'han trobat claus amb confiança absoluta\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr ""
"no s'ha trobat la clau pública de la clau amb confiança absoluta %08lX\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
@@@ -8274,76 -6634,60 +8269,76 @@@ msgstr "canvia la contrasenya
msgid "|N|Initial New PIN"
msgstr "Introduïu el nom d'usuari: "
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr ""
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
#, fuzzy
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NOM|usa NOM com a destinatari predeterminat"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
#, fuzzy
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NOM|usa NOM com a destinatari predeterminat"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
#, fuzzy
msgid "do not use the internal CCID driver"
msgstr "no usa el terminal en absolut"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr ""
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr ""
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
#, fuzzy
msgid "deny the use of admin card commands"
msgstr "les ordres entren en conflicte\n"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -9087,7 -7278,6 +9082,7 @@@ msgstr "afegeix aquest anell a la llist
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOM|usa NOM com a clau secreta predeterminada"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|usa aquest servidor per a cercar claus"
@@@ -9147,18 -7327,15 +9142,18 @@@ msgstr " o = omet aquesta clau\n
msgid "could not parse keyserver\n"
msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, 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:1725
++#: sm/gpgsm.c:1726
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "no s'ha pogut tancar «%s»: %s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -10121,116 -8108,88 +10116,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
#, fuzzy
msgid "run without asking a user"
msgstr "Voleu eixir sense desar? "
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
#, 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:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10243,77 -8202,61 +10238,77 @@@ msgstr "
"@\n"
"(En la pàgina del man hi ha una llista completa d'ordres i d'opcions)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "forma d'ús: gpg [opcions] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
#, 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:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "la línia és massa llarga\n"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "error: l'empremta digital és invàlida\n"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "error de lectura: %s\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
@@@ -10322,17 -8265,14 +10317,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:1889
++#: dirmngr/dirmngr.c:1903
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "no forçat"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10777,77 -8626,61 +10772,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, 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:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, 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:1516
++#: dirmngr/server.c:1610
#, 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:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, 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:2624
++#: dirmngr/server.c:2730
#, 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:2632
++#: dirmngr/server.c:2738
#, 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:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10891,7 -8716,6 +10886,7 @@@ msgstr "Certificat de revocació vàlid
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
#, fuzzy
msgid "quiet"
msgstr "ix"
@@@ -10984,286 -8788,218 +10979,286 @@@ 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr ""
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr ""
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|usa el mode de contrasenya especificat"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "error en la creació de la contrasenya: %s\n"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NOM|usa NOM com a clau secreta predeterminada"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOM|xifra per a NOM"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
#, 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:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
#, 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:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "error de la xarxa"
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
msgid "Passphrase Entry"
msgstr "la contrasenya és errònia"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
#, fuzzy
msgid "Component not suitable for launching"
msgstr "no s'ha trobat la clau pública"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
#, fuzzy
msgid "list global configuration file"
msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
#, fuzzy
msgid "check global configuration file"
msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "actualitza la base de dades de confiança"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "fitxer d'eixida"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
#, fuzzy
msgid "Component not found"
msgstr "no s'ha trobat la clau pública"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
msgid "No argument allowed"
msgstr ""
diff --cc po/cs.po
index 99f2a43,4693f73..af30879
--- a/po/cs.po
+++ b/po/cs.po
@@@ -33,10 -35,9 +35,10 @@@
#
msgid ""
msgstr ""
- "Project-Id-Version: gnupg2 2.1.10\n"
+ "Project-Id-Version: gnupg2 2.2.1\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-11-20 12:04+0100\n"
- "PO-Revision-Date: 2017-11-02 17:38+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
+ "PO-Revision-Date: 2017-11-17 10:33+01:00\n"
"Last-Translator: Petr Pisar <petr.pisar at atlas.cz>\n"
"Language-Team: Czech <gnupg-i18n at gnupg.org>\n"
"Language: cs\n"
@@@ -179,25 -152,10 +181,25 @@@ msgstr "Špatné heslo
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "SSH klíče delší než %d bitů nejsou podporovány\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, c-format
msgid "can't open '%s': %s\n"
msgstr "nelze otevřít „%s“: %s\n"
@@@ -223,13 -176,10 +225,12 @@@ msgstr "na kartě není autentizační
msgid "no suitable card key found: %s\n"
msgstr "nenalezen žádný vhodný klíč karty: %s\n"
+#: agent/command-ssh.c:2614
- #, fuzzy, c-format
- #| msgid "error getting stored flags: %s\n"
+ #, c-format
msgid "error getting list of cards: %s\n"
- msgstr "chyba při získání uložených příznaků: %s\n"
+ msgstr "chyba při získávání seznamu karet: %s\n"
+#: agent/command-ssh.c:2788
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -399,8 -317,6 +400,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:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -408,138 -324,95 +409,134 @@@ msgstr "
"@Volby:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr "poběží v režimu démona (na pozadí)"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr "poběží v režimu serveru (na popředí)"
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
- #, fuzzy
- #| msgid "run in server mode"
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
msgid "run in supervised mode"
- msgstr "pracovat v režimu serveru"
+ msgstr "poběží v režimu dohledu"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "upovídaný režim"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "být o trochu víc tichý"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr "vypisovat příkazy ve stylu sh"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr "vypisovat příkazy ve stylu csh"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|SOUBOR|načíst volby ze SOUBORU"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr "neodpojovat se od konzole"
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "použít pro server soubor s protokolem"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PROGRAM|použít PROGRAM jako PIN-Entry program"
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PROGRAM|použít PROGRAM jako SCdaemon program"
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
msgid "do not use the SCdaemon"
msgstr "nepoužívat SCdémona"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
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:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr "ignorovat požadavky na změnu TTY"
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr "ignorovat požadavky na změnu X displeje"
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|zahodit zapamatované PINy po N sekundách"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr "nepoužívat paměť PINů na podepisování"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
msgid "disallow the use of an external password cache"
msgstr "nedovolit použít vnější úložiště na hesla"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr "nedovolit klientům označovat klíče za „důvěryhodné“"
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
msgid "allow presetting passphrase"
msgstr "umožnit přednastavení hesla"
- #: agent/gpg-agent.c:236
- #, fuzzy
- #| msgid "allow caller to override the pinentry"
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
- msgstr "umožnit volajícímu přebít pinentry"
+ msgstr "zmemožnit volajícímu přebít pinentry"
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr "umožnit zadání hesla skrze Emacs"
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
msgid "enable ssh support"
msgstr "zapnout podporu pro OpenSSH"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
- msgstr ""
+ msgstr "|ALGORITMUS|ukazovat otkisky SSH pomocí ALGORITMU"
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
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:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Použití: @GPG_AGENT@ [volby] (-h pro nápovědu)"
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -547,142 -420,99 +544,135 @@@ msgstr "
"Syntaxe: @GPG_AGENT@ [volby] [příkaz [argumenty]]\n"
"Správa tajných klíčů pro @GNUPG@\n"
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "zadána neplatná úroveň ladění „%s“\n"
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "vybraný hashovací algoritmus je neplatný\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "soubor s možnostmi „%s“: %s\n"
- #: agent/gpg-agent.c:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, c-format
msgid "reading options from '%s'\n"
msgstr "čtou se možnosti z „%s“\n"
- #: agent/gpg-agent.c:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, c-format
msgid "can't create socket: %s\n"
msgstr "socket nelze vytvořit: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "název socketu „%s“ je příliš dlouhý\n"
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
msgid "error getting nonce for the socket\n"
msgstr "chyba při získávání soli pro socket\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, 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:2236 agent/gpg-agent.c:2275 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:2241 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, c-format
- msgid "listen() failed: %s\n"
- msgstr "volání listen() selhalo: %s\n"
+ msgid "can't set permissions of '%s': %s\n"
+ msgstr "přístupová práva „%s“ nelze nastavit: %s\n"
- #: agent/gpg-agent.c:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, c-format
msgid "listening on socket '%s'\n"
msgstr "naslouchá se na socketu „%s“\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "volání stat() na „%s“ selhalo: %s\n"
- #: agent/gpg-agent.c:2327
++#: agent/gpg-agent.c:2351
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "„%s“ nelze použít jako domovský adresář\n"
- #: agent/gpg-agent.c:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, 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:2686
++#: agent/gpg-agent.c:2710
#, 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:2691
++#: agent/gpg-agent.c:2715
#, 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:2766
++#: agent/gpg-agent.c:2790
#, 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:2771
++#: agent/gpg-agent.c:2795
#, 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:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_pselect selhala: %s – čeká se 1 s\n"
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s pozastaveno\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
@@@ -698,8 -526,6 +688,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:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -707,9 -533,6 +697,9 @@@ msgstr "
"@Příkazy:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -764,8 -579,6 +754,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:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, c-format
msgid "error opening '%s': %s\n"
msgstr "chyba při otevírání „%s“: %s\n"
@@@ -949,8 -727,6 +939,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, c-format
msgid "error forking process: %s\n"
msgstr "chyba při rozdvojování procesu: %s\n"
@@@ -976,13 -747,10 +966,12 @@@ msgstr "chyba v běhu „%s“: návrat
msgid "error running '%s': terminated\n"
msgstr "chyba v běhu „%s“: násilně ukončeno\n"
+#: common/exechelp-posix.c:750 common/exechelp-w32.c:777
- #, fuzzy, c-format
- #| msgid "waiting for process %d to terminate failed: %s\n"
+ #, c-format
msgid "waiting for processes to terminate failed: %s\n"
- msgstr "čekání na konec procesu %d se nezdařilo: %s\n"
+ msgstr "čekání na ukončení procesu se nezdařilo: %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 "chyba při získání návratového kódu procesu %d: %s\n"
@@@ -1013,13 -776,10 +1002,12 @@@ msgstr "Varování: vlastnictví %s „
msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgstr "Varování: přístupová práva %s „%s“ nejsou bezpečná\n"
+#: common/sysutils.c:693
- #, fuzzy, c-format
- #| msgid "waiting for the agent to come up ... (%ds)\n"
+ #, c-format
msgid "waiting for file '%s' to become accessible ...\n"
- msgstr "čeká se na agenta… (%d s)\n"
+ msgstr "čekání, až se soubor „%s“ stane přístupným…\n"
+#: common/sysutils.c:719
#, c-format
msgid "renaming '%s' to '%s' failed: %s\n"
msgstr "přejmenování „%s“ na „%s“ se nezdařilo: %s\n"
@@@ -1391,7 -1067,6 +1379,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:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
msgid "out of core\n"
msgstr "nedostatek paměti\n"
@@@ -1450,8 -1114,6 +1438,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:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, 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"
@@@ -1535,13 -1179,11 +1523,13 @@@ msgstr "
"neplatný znak (quoted-printable) v ASCII kódování – pravděpodobně byl použit "
"špatný MTA\n"
+ # TODO: Pluralize
+#: g10/build-packet.c:1210
- #, fuzzy, c-format
- #| msgid "not human readable"
+ #, c-format
msgid "[ not human readable (%zu bytes: %s%s) ]"
- msgstr "není v přímo čitelném formátu"
+ msgstr "[ nečitelné pro lidi (%zu bajtů: %s%s) ]"
+#: g10/build-packet.c:1262
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1561,23 -1200,12 +1549,15 @@@ msgstr "jméno uživatele nesmí obsaho
msgid "a notation value must not use any control characters\n"
msgstr "hodnota nemůže obsahovat žádné kontrolní znaky\n"
+#: g10/build-packet.c:1354
- #, fuzzy
- #| msgid "a notation name must not contain more than one '@' character\n"
msgid "a notation name may not contain an '=' character\n"
- msgstr "jméno uživatele nesmí obsahovat více než jeden znak „@“\n"
+ msgstr "jméno uživatele nesmí obsahovat znak „=“\n"
+#: g10/build-packet.c:1360
- #, fuzzy
- #| msgid ""
- #| "a notation name must have only printable characters or spaces, and end "
- #| "with an '='\n"
msgid "a notation name must have only printable characters or spaces\n"
- msgstr ""
- "symbolické jméno smí obsahovat pouze písmena, číslice, tečky nebo podtržítka "
- "a musí končit znakem „=“\n"
+ msgstr "jméno uživatele musí obsahovat pouze tisknutelné znaky nebo mezery\n"
+#: g10/build-packet.c:1419 g10/build-packet.c:1430
msgid "WARNING: invalid notation data found\n"
msgstr "VAROVÁNÍ: nalezen neplatný formát zápisu data\n"
@@@ -1590,41 -1216,30 +1570,38 @@@ msgstr "předání dotazu %s klientovi
msgid "Enter passphrase: "
msgstr "Vložte heslo: "
+#: 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"
+ #, c-format
msgid "error getting version from '%s': %s\n"
- msgstr "chyba při vytváření souboru klíčů (keyring) „%s“: %s\n"
+ msgstr "chyba při získávání verze z „%s“: %s\n"
+#: 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 ""
+ msgstr "server „%s“ je starší než my (%s < %s)"
+#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
- #, fuzzy, c-format
- #| msgid "WARNING: "
+ #, c-format
msgid "WARNING: %s\n"
- msgstr "VAROVÁNÍ: "
+ msgstr "VAROVÁNÍ: %s\n"
+#: g10/call-agent.c:214 sm/call-agent.c:113 sm/call-dirmngr.c:180
msgid "Note: Outdated servers may lack important security fixes.\n"
msgstr ""
+ "Poznámka: Zastaralé servery mohou postrádat důležité bezpečnostní opravy.\n"
+#: g10/call-agent.c:216 sm/call-agent.c:115 sm/call-dirmngr.c:182
- #, fuzzy, c-format
- #| msgid "Please use the command \"toggle\" first.\n"
+ #, c-format
msgid "Note: Use the command \"%s\" to restart them.\n"
- msgstr "Prosím, nejdříve použijte příkaz „toggle“ (přepnout).\n"
+ msgstr "Poznámka: Restartovat je můžete příkazem „%s“.\n"
+#: g10/call-agent.c:301 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
+#: sm/call-agent.c:191 sm/encrypt.c:425 sm/sign.c:345
- #, fuzzy, c-format
- #| msgid "%s does not yet work with %s\n"
+ #, c-format
msgid "%s is not compliant with %s mode\n"
- msgstr "%s dosud není funkční s %s\n"
+ msgstr "%s není v souladu s režimem %s\n"
+#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1775
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP karta není dostupná: %s\n"
@@@ -1634,12 -1248,9 +1611,12 @@@
msgid "OpenPGP card no. %s detected\n"
msgstr "Nalezena OpenPGP karta číslo %s\n"
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
msgid "can't do this in batch mode\n"
- msgstr "nelze provést v dávkovém módu\n"
+ msgstr "nelze provést v dávkovém režimu\n"
+#: g10/card-util.c:107
msgid "This command is only available for version 2 cards\n"
msgstr "Tento příkaz je dostupný pouze pro karty verze 2\n"
@@@ -1647,18 -1257,12 +1624,18 @@@
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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Váš výběr? "
+#: g10/card-util.c:279 g10/card-util.c:330
msgid "[not set]"
- msgstr "[není nastaven]"
+ msgstr "[není nastaveno]"
+#: g10/card-util.c:534
msgid "male"
msgstr "muž"
@@@ -1707,16 -1300,10 +1684,16 @@@ 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:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, c-format
msgid "error reading '%s': %s\n"
msgstr "chyba při čtení „%s“: %s\n"
- #: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "chyba při zápisu do „%s“: %s\n"
@@@ -1766,7 -1342,6 +1743,7 @@@ msgstr "operace s klíčem není možn�
msgid "not an OpenPGP card"
msgstr "toto není OpenPGP karta"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, 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"
@@@ -1807,13 -1376,10 +1784,13 @@@ msgstr "Jakou délku klíče pro autent
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr "Karta bude nyní přenastavena na generování klíče dlouhého %u bitů\n"
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "zaokrouhleno na %u bitů\n"
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 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"
@@@ -1848,10 -1408,9 +1825,10 @@@ msgid "
"You should change them using the command --change-pin\n"
msgstr ""
"Prosím nezapomeňte, že tovární nastavení PINů je\n"
- " PIN = „%s“ PIN administrátora = „%s“\n"
+ " PIN = „%s“ PIN správce = „%s“\n"
"Měli byste je změnit příkazem --change-pin\n"
+#: g10/card-util.c:1529
msgid "Please select the type of key to generate:\n"
msgstr "Prosím, vyberte druh klíče, který chcete generovat:\n"
@@@ -1867,17 -1423,12 +1844,17 @@@ msgstr " (2) Šifrovací klíč\n
msgid " (3) Authentication key\n"
msgstr " (3) Autentizační klíč\n"
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Neplatný výběr.\n"
+#: g10/card-util.c:1648
msgid "Please select where to store the key:\n"
- msgstr "Prosím vyberte místo pro uchování klíče:\n"
+ msgstr "Prosím vyberte, kam uložit klíč:\n"
+#: g10/card-util.c:1694
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "Volání KEYTOCARD selhalo: %s\n"
@@@ -1903,11 -1449,9 +1880,11 @@@ msgstr "Opravdu obnovit tovární nasta
msgid "quit this menu"
msgstr "ukončit toto menu"
+#: g10/card-util.c:1877
msgid "show admin commands"
- msgstr "zobraz administrátorské příkazy"
+ msgstr "zobraz příkazy správce"
+#: g10/card-util.c:1878 g10/keyedit.c:1259
msgid "show this help"
msgstr "ukázat tuto pomoc"
@@@ -1971,19 -1500,15 +1948,19 @@@ msgstr "zničit všechny klíče a data
msgid "gpg/card> "
msgstr "gpg/karta> "
+#: g10/card-util.c:2060
msgid "Admin-only command\n"
- msgstr "pouze administrátorské příkazy\n"
+ msgstr "pouze příkazy správce\n"
+#: g10/card-util.c:2091
msgid "Admin commands are allowed\n"
- msgstr "administrátorské příkazy jsou povoleny\n"
+ msgstr "příkazy správce jsou povoleny\n"
+#: g10/card-util.c:2093
msgid "Admin commands are not allowed\n"
- msgstr "administrátorské příkazy nejsou povoleny\n"
+ msgstr "příkazy správce nejsou povoleny\n"
+#: g10/card-util.c:2188 g10/keyedit.c:2224
msgid "Invalid command (try \"help\")\n"
msgstr "Neplatný příkaz (zkuste „help“)\n"
@@@ -1996,22 -1519,14 +1973,22 @@@ msgstr "--output pro tento příkaz nen
msgid "can't open '%s'\n"
msgstr "„%s“ nelze otevřít\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "chyba při čtení bloku klíče: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, c-format
msgid "key \"%s\" not found\n"
msgstr "klíč „%s“ nenalezen\n"
@@@ -2020,11 -1534,9 +1997,11 @@@
msgid "(unless you specify the key by fingerprint)\n"
msgstr "(dokud neurčíte klíč jeho otiskem)\n"
+#: g10/delkey.c:135
msgid "can't do this in batch mode without \"--yes\"\n"
- msgstr "bez parametru „--yes“ to nemohu v dávkovém módu provést\n"
+ msgstr "bez parametru „--yes“ to nelze v dávkovém režimu provést\n"
+#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
msgstr "Smazat tento klíč ze souboru klíčů? (a/N) "
@@@ -2072,11 -1575,9 +2049,11 @@@ msgstr "
msgid "error creating passphrase: %s\n"
msgstr "chyba při vytváření hesla: %s\n"
+#: 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"
+ msgstr "v režimu S2K nelze použít symetrický ESK paket\n"
+#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
msgstr "použití šifry: %s\n"
@@@ -2103,20 -1600,14 +2080,18 @@@ msgid "
msgstr ""
"VAROVÁNÍ: vyžádaná symetrická šifra %s (%d) nevyhovuje předvolbám příjemce\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: 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"
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
+ #, c-format
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"
+ msgstr "šifrovací algoritmus „%s“ se nesmí používat v režimu %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"
+ #, c-format
msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
- msgstr "VAROVÁNÍ: „%s%s“ je zastaralý parametr – neúčinkuje\n"
+ msgstr "VAROVÁNÍ: klíč %s není vhodný pro šifrování v režimu %s\n"
+#: g10/encrypt.c:772 g10/sign.c:1028
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2135,13 -1624,10 +2110,12 @@@ msgstr "vyžádaná symetrická šifra
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s zašifrovaný pro: „%s“\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
- #, fuzzy, c-format
- #| msgid "you may not use %s while in %s mode\n"
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
+ #, c-format
msgid "option '%s' may not be used in %s mode\n"
- msgstr "použití %s není v módu %s dovoleno\n"
+ msgstr "volba „%s“ se nesmí používat v režimu %s\n"
+#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
msgstr "%s zašifrovaná data\n"
@@@ -2235,11 -1702,9 +2209,11 @@@ msgstr "odstranit nepoužitelné část
msgid "remove as much as possible from key during export"
msgstr "odstranit při exportu z klíče vše, co lze"
+#: g10/export.c:120
msgid "use the GnuPG key backup format"
- msgstr ""
+ msgstr "použít záložní formát klíče GnuPG"
+#: g10/export.c:1236
msgid " - skipped"
msgstr " – přeskočeno"
@@@ -2250,26 -1713,20 +2224,26 @@@
msgid "writing to '%s'\n"
msgstr "zapisuje se do „%s“\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, 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:1904
++#: g10/export.c:1909
msgid "exporting secret keys not allowed\n"
msgstr "exportování tajného klíče není povoleno\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "VAROVÁNÍ: nebylo nic vyexportováno\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2278,88 -1734,62 +2252,78 @@@
msgid "[User ID not found]"
msgstr "[ID uživatele nenalezeno]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(zkontrolujte argument volby „%s“)\n"
- #: g10/getkey.c:515
- #, fuzzy, c-format
- #| msgid ""
- #| "Warning: value '%s' for option '%s' should be a long key ID or a "
- #| "fingerprint\n"
++#: g10/getkey.c:509
+ #, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
- msgstr ""
- "Pozor: hodnota „%s“ volby „%s“ by měla být\n"
- "dlouhý identifikátor klíče nebo jeho otisk\n"
+ msgstr "Pozor: „%s“ by měl být dlouhý identifikátor klíče nebo jeho otisk\n"
+#: g10/getkey.c:545
- #, fuzzy, c-format
- #| msgid "error closing %s: %s\n"
+ #, c-format
msgid "error looking up: %s\n"
- msgstr "chyba při zavírání chyba %s: %s\n"
+ msgstr "chyba při vyhledávání: %s\n"
- #: g10/getkey.c:635
- #, fuzzy, c-format
- #| msgid "error searching the keyring: %s\n"
++#: g10/getkey.c:638
+ #, c-format
msgid "Warning: %s appears in the keyring %d times\n"
- msgstr "chyba při prohledávání souboru klíčů (keyring): %s\n"
+ msgstr "Pozor: %s se nachází v souboru klíčů (keyring) %dkrát\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "„%s“ automaticky získáno přes %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "chyba při získávání „%s“ přes %s: %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
msgid "No fingerprint"
msgstr "Chybí otisk"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "tajný klíč „%s“ nenalezen: %s\n"
- #: g10/getkey.c:2034
- #, fuzzy, c-format
- #| msgid "using \"%s\" as default secret key\n"
++#: g10/getkey.c:2042
+ #, c-format
msgid "Warning: not using '%s' as default key: %s\n"
- msgstr "jako výchozí tajný klíč se použije „%s“\n"
+ msgstr "Pozor: jako výchozí klíč se nepoužije „%s“: %s\n"
- #: g10/getkey.c:2042
- #, fuzzy, c-format
- #| msgid "using \"%s\" as default secret key\n"
++#: g10/getkey.c:2050
+ #, c-format
msgid "using \"%s\" as default secret key for signing\n"
- msgstr "jako výchozí tajný klíč se použije „%s“\n"
+ msgstr "jako výchozí tajný klíč pro podepisování se použije „%s“\n"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
- msgstr ""
+ msgstr "všechny hodnoty předány „%s“ se ignorují\n"
# c-format
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, 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/getkey.c:4398 g10/gpg.c:2069
- #, fuzzy, c-format
- #| msgid "invalid argument for option \"%.50s\"\n"
++#: g10/getkey.c:4406 g10/gpg.c:2069
+ #, c-format
msgid "valid values for option '%s':\n"
- msgstr "neplatný argument u volby „%.50s“\n"
+ msgstr "platné hodnoty pro volbu „%s“:\n"
+#: g10/gpg.c:434 sm/gpgsm.c:201
msgid "make a signature"
msgstr "vytvořit podpis"
@@@ -2419,19 -1835,12 +2383,15 @@@ msgstr "rychle vytvořit nový pár kl�
msgid "quickly add a new user-id"
msgstr "rychle přidat novou identitu uživatele"
+#: g10/gpg.c:467
- #, fuzzy
- #| msgid "quickly add a new user-id"
msgid "quickly revoke a user-id"
- msgstr "rychle přidat novou identitu uživatele"
+ msgstr "rychle odvolat identitu uživatele"
+#: g10/gpg.c:470
- #, fuzzy
- #| msgid "quickly generate a new key pair"
msgid "quickly set a new expiration date"
- msgstr "rychle vytvořit nový pár klíčů"
+ msgstr "rychle nastavit nové datum konce platnosti"
+#: g10/gpg.c:473
msgid "full featured key pair generation"
msgstr "komplexní vytvoření páru klíčů"
@@@ -2519,19 -1907,12 +2479,15 @@@ msgstr "vypsat hash zprávy
msgid "run in server mode"
msgstr "pracovat v režimu serveru"
+#: g10/gpg.c:539
- #, fuzzy
- #| msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
msgid "|VALUE|set the TOFU policy for a key"
- msgstr ""
- "|HODNOTA|nastavit TOFU politiku klíči (good [dobrý], unknown [neznámý], bad "
- "[špatný], ask [zeptat se], auto)"
+ msgstr "|HODNOTA|nastavit TOFU politiku klíči"
+#: g10/gpg.c:543 sm/gpgsm.c:249
msgid "create ascii armored output"
- msgstr "vytvoř výstup zakódovaný pomocí ASCII"
+ msgstr "vytvořit výstup zapsaný v ASCII"
+#: g10/gpg.c:546 sm/gpgsm.c:265
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ID_UŽIVATELE|šifrovat pro ID_UŽIVATELE"
@@@ -2543,15 -1922,12 +2499,15 @@@ msgstr "|ID_UŽIVATELE|použít toto ID
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|nastavit úroveň komprese na N (0 – žádná)"
+#: g10/gpg.c:575
msgid "use canonical text mode"
- msgstr "použít kanonický textový mód"
+ msgstr "použít kanonický textový režim"
+#: g10/gpg.c:592 g10/gpgv.c:80 sm/gpgsm.c:303
msgid "|FILE|write output to FILE"
msgstr "|SOUBOR|zapsat výstup do SOUBORU"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "neprovádět žádné změny"
@@@ -2569,19 -1942,8 +2525,9 @@@ msgid "
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
"@\n"
- "(Pro kompletní seznam všech příkazů a možností použijte manuálové stránky.)\n"
+ "(Pro úplný seznam všech příkazů a voleb nahlédněte do manuálové stránky.)\n"
+#: g10/gpg.c:687
- #, fuzzy
- #| msgid ""
- #| "@\n"
- #| "Examples:\n"
- #| "\n"
- #| " -se -r Bob [file] sign and encrypt for user Bob\n"
- #| " --clear-sign [file] make a clear text signature\n"
- #| " --detach-sign [file] make a detached signature\n"
- #| " --list-keys [names] show keys\n"
- #| " --fingerprint [names] show fingerprints\n"
msgid ""
"@\n"
"Examples:\n"
@@@ -2593,13 -1955,14 +2539,15 @@@
" --fingerprint [names] show fingerprints\n"
msgstr ""
"@\n"
+ "Příklady:\n"
+ "\n"
" -se -r Bob [soubor] podepsat a zašifrovat pro uživatele Bob\n"
- " --clear-sign [soubor] vytvořit podpis čitelného dokumentu\n"
+ " --clearsign [soubor] vytvořit podpis čitelného dokumentu\n"
" --detach-sign [soubor] vytvořit podpis oddělený od dokumentu\n"
- " --list-keys [jména] vypsat klíče\n"
- " --fingerprint [jména] vypsat otisky\n"
+ " --list-keys [jména] ukázat klíče\n"
+ " --fingerprint [jména] ukázat otisky\n"
+#: g10/gpg.c:1059
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Použití: @GPG@ [možnosti] [soubory] (-h pro nápovědu)"
@@@ -2807,13 -2131,10 +2755,12 @@@ msgstr "Poznámka: %s není pro normál
msgid "'%s' is not a valid signature expiration\n"
msgstr "„%s“ není platná doba expirace podpisu\n"
+#: g10/gpg.c:3064
- #, fuzzy, c-format
- #| msgid "line %d: not a valid email address\n"
+ #, c-format
msgid "\"%s\" is not a proper mail address\n"
- msgstr "řádek %d: neplatná e-mailová adresa\n"
+ msgstr "„%s“ není správná e-mailová adresa\n"
+#: g10/gpg.c:3096 sm/gpgsm.c:1162
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "neplatný režim pinentry „%s“\n"
@@@ -2845,13 -2160,10 +2792,12 @@@ msgstr "%s:%d: neplatný parametr pro i
msgid "invalid import options\n"
msgstr "neplatný parametr pro import\n"
+#: g10/gpg.c:3210 g10/gpg.c:3225
- #, fuzzy, c-format
- #| msgid "invalid list options\n"
+ #, c-format
msgid "invalid filter option: %s\n"
- msgstr "neplatný parametr pro výpis\n"
+ msgstr "neplatná volba filtru: %s\n"
+#: g10/gpg.c:3216
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatný parametr pro export\n"
@@@ -2936,7 -2229,6 +2882,7 @@@ msgstr "%s:%d: neplatný seznam auto-ke
msgid "invalid auto-key-locate list\n"
msgstr "neplatný seznam auto-key-locate\n"
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVÁNÍ: program může vytvořit soubor core!\n"
@@@ -2955,7 -2244,6 +2901,7 @@@ msgstr "Není dovoleno používat %s s
msgid "%s makes no sense with %s!\n"
msgstr "%s nedává s %s smysl!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr "VAROVÁNÍ: pracuji s podvrženým systémovým časem: "
@@@ -2964,7 -2251,6 +2910,7 @@@
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:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "vybraný šifrovací algoritmus je neplatný\n"
@@@ -3000,15 -2279,12 +2946,15 @@@ msgstr "
"neplatná minimální úroveň certifikace (min-cert-level); musí být 0, 1, 2 "
"nebo 3\n"
+#: g10/gpg.c:3776
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"
+ msgstr "Poznámka: jednoduchý režim S2K (0) je důrazně nedoporučován\n"
+#: g10/gpg.c:3780
msgid "invalid S2K mode; must be 0, 1 or 3\n"
- msgstr "neplatný mód S2K; musí být 0, 1 nebo 3\n"
+ msgstr "neplatný režim S2K; musí být 0, 1 nebo 3\n"
+#: g10/gpg.c:3787
msgid "invalid default preferences\n"
msgstr "neplatné implicitní předvolby\n"
@@@ -3029,20 -2301,14 +2975,18 @@@ msgstr "neplatné uživatelské předvo
msgid "%s does not yet work with %s\n"
msgstr "%s dosud není funkční s %s\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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"
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 sm/sign.c:478 sm/verify.c:473
+ #, c-format
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"
+ msgstr "hashovací algoritmus „%s“ se nesmí používat v režimu %s\n"
+#: g10/gpg.c:3894
- #, fuzzy, c-format
- #| msgid "you may not use compression algorithm '%s' while in %s mode\n"
+ #, c-format
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"
+ msgstr "kompresní algoritmus „%s“ se nesmí používat v režimu %s\n"
+#: g10/gpg.c:4034
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nemohu inicializovat databázi důvěry: %s\n"
@@@ -3061,23 -2324,17 +3005,21 @@@ msgstr "symetrické šifrování „%s�
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:4150
- #, fuzzy, c-format
- #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+ #, c-format
msgid "you cannot use --symmetric --encrypt in %s mode\n"
- msgstr "nelze použít --symmetric --encrypt v módu %s\n"
+ msgstr "nelze použít --symmetric --encrypt v režimu %s\n"
+#: g10/gpg.c:4208
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:4211
- #, fuzzy, c-format
- #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+ #, c-format
msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
- msgstr "nelze použít --symmetric --sign --encrypt v módu %s\n"
+ msgstr "nelze použít --symmetric --sign --encrypt v režimu %s\n"
+#: g10/gpg.c:4568 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "odeslání na keyserver se nezdařilo: %s\n"
@@@ -3092,13 -2347,10 +3034,12 @@@ msgstr "získání dat z serveru klíč
msgid "key export failed: %s\n"
msgstr "export klíče se nepodařil: %s\n"
+#: g10/gpg.c:4592
- #, fuzzy, c-format
- #| msgid "key export failed: %s\n"
+ #, c-format
msgid "export as ssh key failed: %s\n"
- msgstr "export klíče se nepodařil: %s\n"
+ msgstr "export jako SSH klíč se nepodařil: %s\n"
+#: g10/gpg.c:4604
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "hledání na serveru klíčů se nezdařilo: %s\n"
@@@ -3133,11 -2379,9 +3074,11 @@@ msgstr "chyba při rozboru názvu klí�
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:4996
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
- msgstr ""
+ msgstr "POZOR: nezadán žádný příkaz. Váš záměr bude odhadnut…\n"
+#: g10/gpg.c:5007
msgid "Go ahead and type your message ...\n"
msgstr "Začněte psát svou zprávu…\n"
@@@ -3161,15 -2400,12 +3102,15 @@@ 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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|zapsat informace o stavu do tohoto FD"
+#: g10/gpgv.c:89
msgid "|ALGO|reject signatures made with ALGO"
- msgstr ""
+ msgstr "|ALGORITMUS|zamítnout podpisy založené na ALGORITMU"
+#: g10/gpgv.c:148
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Použití: gpg [volby] [soubory] (-h pro pomoc)"
@@@ -3206,13 -2435,9 +3147,11 @@@ msgstr "nemazat údaje o důvěře bě
msgid "do not update the trustdb after import"
msgstr "neaktualizovat databázi důvěry po importu"
+#: g10/import.c:172
- #, fuzzy
- #| msgid "show key fingerprint"
msgid "show key during import"
- msgstr "vypsat otisk klíče"
+ msgstr "při importu ukázat klíč"
+#: g10/import.c:175
msgid "only accept updates to existing keys"
msgstr "přijímat aktualizace pouze u existujících klíčů"
@@@ -3224,23 -2447,15 +3163,19 @@@ msgstr "odstranit z klíče po import
msgid "remove as much as possible from key after import"
msgstr "odstranit po importu z klíče vše, co lze"
+#: g10/import.c:184
msgid "run import filters and export key immediately"
- msgstr ""
+ msgstr "spustit importní filtry a exportovat klíč okamžitě"
+#: 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"
+ msgstr "předpokládat vstup ve formátu zálohy klíčů GnuPG"
+#: g10/import.c:191
- #, fuzzy
- #| msgid "show key fingerprint"
msgid "repair keys on import"
- msgstr "vypsat otisk klíče"
+ msgstr "při importu opravit klíče"
+#: g10/import.c:356 g10/import.c:594
#, c-format
msgid "skipping block of type %d\n"
msgstr "blok typu %d byl přeskočen\n"
@@@ -3597,22 -2744,18 +3532,22 @@@ msgstr "klíč %s: neplatná vazba podk
msgid "key %s: removed multiple subkey binding\n"
msgstr "klíč %s: smazána vícenásobná vazba podklíče\n"
+#: g10/import.c:2882
#, c-format
msgid "key %s: no subkey for key revocation\n"
- msgstr "klíč %s: neexistuje podklíč pro revokaci klíče\n"
+ msgstr "klíč %s: neexistuje podklíč pro odvolání klíče\n"
+#: g10/import.c:2895
#, c-format
msgid "key %s: invalid subkey revocation\n"
- msgstr "klíč %s: neplatný revokační podklíč\n"
+ msgstr "klíč %s: neplatný odvolací podklíč\n"
+#: g10/import.c:2910
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
- msgstr "klíč %s: smazána vícenásobná revokace podklíče\n"
+ msgstr "klíč %s: vícenásobná odvolání podklíče smazáno\n"
+#: g10/import.c:2953
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "klíč %s: přeskočen identifikátor uživatele „%s“\n"
@@@ -3652,18 -2788,14 +3587,17 @@@ msgstr "klíč %s: neočekávaná podpi
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "klíč %s: objeven duplikovaný identifikátor uživatele - sloučen\n"
+#: g10/import.c:3264
#, 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"
+ msgstr "VAROVÁNÍ: klíč %s může být odvolán: zkouším získat revokační klíč %s\n"
+#: g10/import.c:3280
#, 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"
+ msgstr "VAROVÁNÍ: klíč %s může být odvolán: revokační klíč %s nenalezen.\n"
+#: g10/import.c:3346
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "klíč %s: „%s“ přidán revokační certifikát\n"
@@@ -3708,11 -2832,9 +3642,11 @@@ 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:260
msgid "[revocation]"
- msgstr "[revokace]"
+ msgstr "[odvolání]"
+#: g10/keyedit.c:260
msgid "[self-signature]"
msgstr "[podpis klíče jím samým]"
@@@ -3759,13 -2875,10 +3693,13 @@@ msgstr "
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:559
#, c-format
msgid "User ID \"%s\" is revoked."
- msgstr "Uživatelské ID „%s“ je revokováno."
+ msgstr "Uživatelské ID „%s“ je odvoláno."
+#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
+#: g10/keyedit.c:1651
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) "
@@@ -4140,11 -3172,9 +4074,11 @@@ 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:1644 g10/keyedit.c:2662 g10/keyedit.c:2801 g10/keyedit.c:2869
msgid "Key is revoked."
- msgstr "Klíč revokován."
+ msgstr "Klíč je odvolán."
+#: g10/keyedit.c:1667
msgid "Really sign all user IDs? (y/N) "
msgstr "Opravdu podepsat všechny id uživatele? (a/N) "
@@@ -4161,12 -3188,10 +4095,12 @@@ msgstr "Nápověda: Vyberte id uživate
msgid "Unknown signature type '%s'\n"
msgstr "Neznámý typ podpisu „%s“\n"
+#: g10/keyedit.c:1714
#, c-format
msgid "This command is not allowed while in %s mode.\n"
- msgstr "Tento příkaz není v módů %s dovolený.\n"
+ msgstr "Tento příkaz není v režimu %s dovolen.\n"
+#: g10/keyedit.c:1736 g10/keyedit.c:1760 g10/keyedit.c:1957
msgid "You must select at least one user ID.\n"
msgstr "Musíte vybrat alespoň jeden id uživatele.\n"
@@@ -4223,27 -3236,21 +4157,27 @@@ msgstr "Opravdu chcete smazat vybrané
msgid "Do you really want to delete this key? (y/N) "
msgstr "Opravdu chcete smazat tento klíč? (a/N) "
+#: g10/keyedit.c:1963
msgid "Really revoke all selected user IDs? (y/N) "
- msgstr "Opravdu revokovat všechny vybrané id uživatele? (a/N) "
+ msgstr "Opravdu odvolat všechna vybraná ID uživatele? (a/N) "
+#: g10/keyedit.c:1964
msgid "Really revoke this user ID? (y/N) "
- msgstr "Opravdu revokovat tento id uživatele? (a/N) "
+ msgstr "Opravdu odvolat toto ID uživatele? (a/N) "
+#: g10/keyedit.c:1982
msgid "Do you really want to revoke the entire key? (y/N) "
- msgstr "Opravdu chcete revokovat celý klíč? (a/N) "
+ msgstr "Opravdu chcete odvolat celý klíč? (a/N) "
+#: g10/keyedit.c:1993
msgid "Do you really want to revoke the selected subkeys? (y/N) "
- msgstr "Opravdu chcete revokovat vybrané podklíče? (a/N) "
+ msgstr "Opravdu chcete odvolat vybrané podklíče? (a/N) "
+#: g10/keyedit.c:1995
msgid "Do you really want to revoke this subkey? (y/N) "
- msgstr "Opravdu chcete revokovat tento podklíč? (a/N) "
+ msgstr "Opravdu chcete odvolat tento podklíč? (a/N) "
+#: g10/keyedit.c:2053
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 "
@@@ -4279,25 -3278,17 +4213,21 @@@ msgstr "aktualizace selhala: %s\n
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:2444
- #, 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"
+ msgstr "poslední platné ID uživatele nelze odvolat.\n"
+#: g10/keyedit.c:2471
- #, fuzzy, c-format
- #| msgid "checking the trust list failed: %s\n"
+ #, c-format
msgid "revoking the user ID failed: %s\n"
- msgstr "kontrola seznamu důvěry se nepodařila: %s\n"
+ msgstr "odvolání ID uživatele se nepodařilo: %s\n"
+#: g10/keyedit.c:2537
- #, fuzzy, c-format
- #| msgid "checking the trust list failed: %s\n"
+ #, c-format
msgid "setting the primary user ID failed: %s\n"
- msgstr "kontrola seznamu důvěry se nepodařila: %s\n"
+ msgstr "nastavení primárního ID uživatele se nepodařilo: %s\n"
+#: g10/keyedit.c:2568
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "„%s“ není otisk\n"
@@@ -4307,13 -3297,10 +4237,12 @@@
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "„%s“ není primární otisk\n"
+#: g10/keyedit.c:2733 g10/keyedit.c:2736
- #, fuzzy, c-format
- #| msgid "read error in '%s': %s\n"
+ #, c-format
msgid "Invalid user ID '%s': %s\n"
- msgstr "chyba při čtení v „%s“: %s\n"
+ msgstr "Neplatné ID uživatele „%s“: %s\n"
+#: g10/keyedit.c:2739
msgid "No matching user IDs."
msgstr "Žádný identifikátor uživatele neodpovídá."
@@@ -4321,25 -3307,18 +4250,22 @@@
msgid "Nothing to sign.\n"
msgstr "Nic na podepsání.\n"
+#: g10/keyedit.c:2877
- #, fuzzy, c-format
- #| msgid "'%s' is not a valid signature expiration\n"
+ #, c-format
msgid "'%s' is not a valid expiration time\n"
- msgstr "„%s“ není platná doba expirace podpisu\n"
+ msgstr "„%s“ není platná doba expirace\n"
+#: g10/keyedit.c:2920
- #, fuzzy, c-format
- #| msgid "\"%s\" is not a fingerprint\n"
+ #, c-format
msgid "\"%s\" is not a proper fingerprint\n"
- msgstr "„%s“ není otisk\n"
+ msgstr "„%s“ není řádný otisk\n"
+#: g10/keyedit.c:2944
- #, fuzzy, c-format
- #| msgid "key \"%s\" not found\n"
+ #, c-format
msgid "subkey \"%s\" not found\n"
- msgstr "klíč „%s“ nenalezen\n"
+ msgstr "podklíč „%s“ nenalezen\n"
+#: g10/keyedit.c:3067
msgid "Digest: "
msgstr "Hash: "
@@@ -4363,17 -3337,14 +4289,17 @@@ msgstr "Poznámky:
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:3476
#, 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"
+ msgstr "V %s byl následující klíč odvolán %s klíčem %s\n"
+#: g10/keyedit.c:3500
#, 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 "
+ msgstr "Tento klíč může být odvolán %s klíčem %s "
+#: g10/keyedit.c:3506
msgid "(sensitive)"
msgstr "(citlivá informace)"
@@@ -4382,12 -3352,10 +4308,12 @@@
msgid "created: %s"
msgstr "vytvořen: %s"
+#: g10/keyedit.c:3551 g10/keylist.c:1938
#, c-format
msgid "revoked: %s"
- msgstr "revokován: %s"
+ msgstr "odvolán: %s"
+#: g10/keyedit.c:3553 g10/keylist.c:1944
#, c-format
msgid "expired: %s"
msgstr "platnost skončila: %s"
@@@ -4474,7 -3423,6 +4400,7 @@@ msgstr "Jste si jistý, že jej chcete
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Neměli by jste přidávat fotografický ID k PGP2 klíči.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr "Takový identifikátor uživatele již u tohoto klíče existuje!\n"
@@@ -4494,16 -3438,13 +4420,15 @@@ msgstr "Smazat tento neznámý podpis?
msgid "Really delete this self-signature? (y/N)"
msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)"
+#: g10/keyedit.c:4105
- #, fuzzy, c-format
- #| msgid "Deleted %d signature.\n"
+ #, c-format
msgid "Deleted %d signature.\n"
msgid_plural "Deleted %d signatures.\n"
msgstr[0] "Smazán %d podpis.\n"
- msgstr[1] "Smazán %d podpis.\n"
- msgstr[2] "Smazán %d podpis.\n"
+ msgstr[1] "Smazány %d podpisy.\n"
+ msgstr[2] "Smazáno %d podpisů.\n"
+#: g10/keyedit.c:4109
msgid "Nothing deleted.\n"
msgstr "Nic nebylo smazáno.\n"
@@@ -4516,16 -3455,13 +4441,15 @@@ msgstr "neplatný
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Uživatelské ID „%s“ směstnáno: %s\n"
+#: g10/keyedit.c:4152
- #, fuzzy, c-format
- #| msgid "User ID \"%s\": %d signature removed\n"
+ #, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d 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"
+ msgstr[0] "Uživatelské ID „%s“: odstraněn %d podpis\n"
+ msgstr[1] "Uživatelské ID „%s“: odstraněny %d podpisy\n"
+ msgstr[2] "Uživatelské ID „%s“: odstraněno %d podpisů\n"
+#: g10/keyedit.c:4160
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Uživatelské ID „%s“: je již minimalizované\n"
@@@ -4541,40 -3475,32 +4465,40 @@@ msgid "
"cause\n"
" some versions of PGP to reject this key.\n"
msgstr ""
- "VAROVÁNÍ: Toto je PGP2 klíč. Přidání 'pověření revokace' může v některých\n"
+ "VAROVÁNÍ: Toto je PGP2 klíč. Přidání pověřeého odvolatele může v některých\n"
" verzích PGP vést k odmítnutí tohoto klíče.\n"
+#: g10/keyedit.c:4241
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"
+ msgstr "K PGP2 klíči byste neměli přidávat pověřeného odvolatele.\n"
+#: g10/keyedit.c:4258
msgid "Enter the user ID of the designated revoker: "
- msgstr "Vložte identifikátor uživatele pověřeného revokací: "
+ msgstr "Vložte identifikátor pověřeného odvolatele: "
+#: g10/keyedit.c:4283
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"
+ msgstr "klíč formátu PGP 2.x nelze pověřit odvoláním\n"
+#: g10/keyedit.c:4298
msgid "you cannot appoint a key as its own designated revoker\n"
- msgstr "klíč nelze pověřit revokací jím samým\n"
+ msgstr "klíč nelze pověřit odvoláním sama sebe\n"
+#: g10/keyedit.c:4320
msgid "this key has already been designated as a revoker\n"
- msgstr "tento klíč již byl pověřen revokací\n"
+ msgstr "tento klíč již byl určen jako odvolatel\n"
+#: g10/keyedit.c:4338
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"
+ "VAROVÁNÍ: ustanovení klíče pověřeným odvolatelem je nevratná operace!\n"
+#: g10/keyedit.c:4344
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) "
+ msgstr "Jste si jistí, že tento klíč chcete pověřit odvoláním? (a/N) "
+#: g10/keyedit.c:4412
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
@@@ -4670,15 -3576,12 +4594,15 @@@ msgstr " (neexportovatelné)
msgid "This signature expired on %s.\n"
msgstr "Platnost podpisu vyprší %s.\n"
+#: g10/keyedit.c:5687
msgid "Are you sure you still want to revoke it? (y/N) "
- msgstr "Jste si jistý, že jej chcete stále revokovat? (a/N) "
+ msgstr "Jste si jisti, že jej chcete stále odvolat? (a/N) "
+#: g10/keyedit.c:5692
msgid "Create a revocation certificate for this signature? (y/N) "
- msgstr "Vytvořit pro tento podpis revokační certifikát? (a/N)"
+ msgstr "Vytvořit pro tento podpis odvolací certifikát? (a/N)"
+#: g10/keyedit.c:5746
msgid "Not signed by you.\n"
msgstr "Nepodepsáno vámi.\n"
@@@ -4691,66 -3592,50 +4615,63 @@@ msgstr "Podepsal(a) jste následujíc�
msgid " (non-revocable)"
msgstr " (neodvolatelné)"
+#: g10/keyedit.c:5788
#, c-format
msgid "revoked by your key %s on %s\n"
- msgstr "revokováno vaším klíčem %s v %s\n"
+ msgstr "odvoláno vaším klíčem %s v %s\n"
+#: g10/keyedit.c:5813
msgid "You are about to revoke these signatures:\n"
- msgstr "Chystáte se revokovat tyto podpisy:\n"
+ msgstr "Chystáte se odvolat tyto podpisy:\n"
+#: g10/keyedit.c:5836
msgid "Really create the revocation certificates? (y/N) "
- msgstr "Opravdu vytvořit revokační certifikáty? (a/N) "
+ msgstr "Opravdu vytvořit odvolací certifikáty? (a/N) "
+#: g10/keyedit.c:5869
msgid "no secret key\n"
msgstr "neexistuje tajný klíč\n"
+#: g10/keyedit.c:5917
#, c-format
msgid "tried to revoke a non-user ID: %s\n"
- msgstr ""
+ msgstr "pokud odvolat ID neuživatele: %s\n"
+#: g10/keyedit.c:5927
#, c-format
msgid "user ID \"%s\" is already revoked\n"
- msgstr "uživatelské ID „%s“ je již revokováno\n"
+ msgstr "uživatelské ID „%s“ je již odvoláno\n"
+#: g10/keyedit.c:5944
#, 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:6040
- #, 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"
+ msgstr "Poslední platné ID uživatele nelze odvolat.\n"
+#: g10/keyedit.c:6078
#, c-format
msgid "Key %s is already revoked.\n"
- msgstr "Klíč %s je již revokován.\n"
+ msgstr "Klíč %s je již odvolán.\n"
+#: g10/keyedit.c:6140
#, c-format
msgid "Subkey %s is already revoked.\n"
- msgstr "Podklíč %s je již revokován.\n"
+ msgstr "Podklíč %s je již odvolán.\n"
+#: g10/keyedit.c:6237
#, 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:169
- #, fuzzy, c-format
- #| msgid "invalid argument for option \"%.50s\"\n"
+ #, c-format
msgid "invalid value for option '%s'\n"
- msgstr "neplatný argument u volby „%.50s“\n"
+ msgstr "neplatný argument u volby „%s“\n"
+#: g10/keygen.c:318
#, c-format
msgid "preference '%s' duplicated\n"
msgstr "duplicita předvolby „%s“\n"
@@@ -4767,54 -3649,42 +4688,54 @@@ msgstr "příliš mnoho předvoleb pro
msgid "too many compression preferences\n"
msgstr "příliš mnoho předvoleb pro komprimaci\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "neplatná položka „%s“ v řetězci s předvolbami\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "zapisuji podpis klíče jím samým (direct signature)\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "zapisuji podpis klíče sebou samým\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "zapisuji „key-binding“ podpis\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "neplatná délka klíče; použiji %u bitů\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "délka klíče zaokrouhlena na %u bitů\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"VAROVÁNÍ: některé OpenPGP programy nedokáží zacházet s DSA klíčem s takto "
"dlouhým hashem\n"
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
msgid "Sign"
msgstr "Podepisování"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr "Certifikování"
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
msgid "Encrypt"
msgstr "Šifrování"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr "Autentizace"
@@@ -4828,150 -3698,119 +4749,150 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Pro klíč %s lze provést: "
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr "Aktuálně povolené akce: "
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Zapnout/vypnout schopnost podepisovat\n"
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Zapnout/vypnout schopnost šifrovat\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Zapnout/vypnout schopnost autentizovat\n"
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Konec\n"
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Prosím, vyberte druh klíče, který chcete:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA a RSA (implicitní)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA a Elgamal\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (pouze pro podpis)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (pouze pro podpis)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (pouze pro šifrování)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (pouze pro šifrování)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (nastavit si vlastní použití)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (nastavit si vlastní použití)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) ECC a ECC\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, c-format
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) ECC (pouze pro podpis)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) ECC (nastavit si vlastní použití)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, c-format
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) ECC (pouze pro šifrování)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) Existující klíč\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
msgid "Enter the keygrip: "
msgstr "Vložte keygrip: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "Není platným keygripem (očekáváno 40 šestnáctkových číslic)\n"
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
msgid "No key with this keygrip\n"
msgstr "Klíč s takovým keygripem neexistuje\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, c-format
msgid "rounded to %u bits\n"
msgstr "zaokrouhleno na %u bitů\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "klíč %s může mít délku v intervalu %u až %u bitů.\n"
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Jakou délku podklíče si přejete? (%u) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Jakou délku klíče si přejete? (%u) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Požadovaná délka klíče je %u bitů.\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
msgid "Please select which elliptic curve you want:\n"
msgstr "Prosím, vyberte, kterou eliptickou křivku chcete:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -4987,7 -3826,6 +4908,7 @@@ msgstr "
" <n>m = doba platnosti klíče skončí za n měsíců\n"
" <n>y = doba platnosti klíče skončí za n let\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5003,38 -3841,30 +4924,38 @@@ msgstr "
" <n>m = doba platnosti podpisu skončí za n měsíců\n"
" <n>y = doba platnosti podpisu skončí za n let\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
- msgstr "Klíč je platný pro? (0) "
+ msgstr "Klíč je platný po? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Podpis je platný pro? (%s) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "neplatná hodnota\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
msgid "Key does not expire at all\n"
msgstr "Platnost klíče nikdy neskončí\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
msgid "Signature does not expire at all\n"
msgstr "Platnost podpisu nikdy neskončí\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, c-format
msgid "Key expires at %s\n"
msgstr "Platnost klíče skončí v %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, c-format
msgid "Signature expires at %s\n"
msgstr "Platnost podpisu skončí v %s\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5042,11 -3872,9 +4963,11 @@@ msgstr "
"Váš systém neumí zobrazit data po roce 2038.\n"
"V každém případě budou data korektně zpracovávána do roku 2106.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
msgid "Is this correct? (y/N) "
msgstr "Je to správně (a/N)? "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5061,7 -3889,6 +4982,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5077,49 -3904,38 +4998,49 @@@ msgstr "
" „Magda Prochazkova (student) <magda at domena.cz>“\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Jméno a příjmení: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Neplatný znak ve jméně\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr "Znaky „%s“ a „%s“ se ve jméně nesmí objevit\n"
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "Jméno nemůže začínat číslicí\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "Jméno musí být dlouhé alespoň 5 znaků\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "E-mailová adresa: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "Neplatná e-mailová adresa\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Komentář: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Neplatný znak v komentáři\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "Používáte znakovou sadu „%s“.\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5130,7 -3946,6 +5051,7 @@@ msgstr "
" „%s“\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Do pole jméno nebo komentář nepište, prosím, e-mailovou adresu.\n"
@@@ -5145,33 -3960,26 +5066,33 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "jJkKeEPpUu"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Změnit (J)méno, (K)omentář, (E)-mail nebo (U)končit? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Změnit (J)méno, (K)omentář, (E)-mail, (P)okračovat dál nebo (U)končit "
"program? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Změnit (J)méno, (E)-mail nebo (U)končit? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Změnit (J)méno, (E)-mail, (P)okračovat dál nebo (U)končit? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Nejdřív, prosím, opravte chybu\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
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"
@@@ -5184,13 -3992,10 +5105,13 @@@ msgstr "
"používat disky); díky tomu má generátor lepší šanci získat dostatek "
"entropie.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvoření klíče se nepodařilo: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5201,62 -4006,49 +5122,62 @@@ msgstr "
" „%s“\n"
"\n"
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr "Pokračovat (A/n) "
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Klíč pro „%s“ již existuje\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
msgid "Create anyway? (y/N) "
msgstr "Přesto vytvořit? (a/N) "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
msgid "creating anyway\n"
msgstr "přesto se vytváří\n"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr "Poznámka: Pro komplexní tvorbu klíče použijte „%s %s“.\n"
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Vytváření klíče bylo zrušeno.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "záložní soubor „%s“ nelze vytvořit: %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "Poznámka: záloha klíče z karty uložena do „%s“\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, c-format
msgid "writing public key to '%s'\n"
msgstr "veřejný klíč se zapisuje do „%s“\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenalezen zapisovatelný soubor veřejných klíčů (pubring): %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "chyba při zápisu do souboru veřejných klíčů „%s“: %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
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:4837
++#: g10/keygen.c:4859
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"
@@@ -5264,7 -4056,6 +5185,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:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5272,7 -4063,6 +5193,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:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5280,19 -4070,15 +5201,19 @@@ msgstr "
"klíč byl vytvořen %lu sekund v budoucnosti (došlo ke změně času nebo\n"
"je problém se systémovým časem)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajné části primárního klíče nejsou dostupné.\n"
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
msgid "Really create? (y/N) "
msgstr "Opravdu vytvořit? (a/N) "
@@@ -5320,52 -4100,41 +5241,47 @@@ msgstr "Kritická podepisovací notace
msgid "Signature notation: "
msgstr "Podepisovací notace: "
+#: g10/keylist.c:474
- #, fuzzy, c-format
- #| msgid "%d good signatures\n"
+ #, c-format
msgid "%d good signature\n"
msgid_plural "%d good signatures\n"
- msgstr[0] "%d dobrých podpisů\n"
- msgstr[1] "%d dobrých podpisů\n"
+ msgstr[0] "%d dobrý podpis\n"
+ msgstr[1] "%d dobré podpisy\n"
msgstr[2] "%d dobrých podpisů\n"
+#: g10/keylist.c:478
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
+ #, c-format
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[0] "%d špatný podpis\n"
+ msgstr[1] "%d špatné podpisy\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"
+ #, 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 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"
+ msgstr[0] "%d podpis neověřen, protože chybí klíč\n"
+ msgstr[1] "%d podpisy neověřeny, protože chybí klíče\n"
+ msgstr[2] "%d podpisů neověřeno, protože chybí klíče\n"
+#: g10/keylist.c:487
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
+ #, 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 podpis neověřen, protože vznikla chyba\n"
- msgstr[1] "1 podpis neověřen, protože vznikla chyba\n"
- msgstr[2] "1 podpis neověřen, protože vznikla chyba\n"
+ msgstr[0] "%d podpis neověřen, protože došlo k chybě\n"
+ msgstr[1] "%d podpisy neověřeny, protože došlo k chybám\n"
+ msgstr[2] "%d podpisů neověřeno, protože došlo k chybám\n"
+#: g10/keylist.c:569
- #, fuzzy, c-format
- #| msgid "Warning: %lu key(s) skipped due to their large size\n"
+ #, 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] "Pozor: %lu klíč(ů) přeskočen(o) kvůli jejich přílišné velikosti\n"
- 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"
+ msgstr[0] "Pozor: %lu klíč přeskočen kvůli jeho přílišné velikosti\n"
+ msgstr[1] "Pozor: %lu klíče přeskočeny kvůli jejich přílišné velikosti\n"
+ msgstr[2] "Pozor: %lu klíčů přeskočeno kvůli jejich přílišné velikosti\n"
+#: g10/keylist.c:591
msgid "Keyring"
msgstr "Soubor klíčů (keyring)"
@@@ -5400,34 -4162,27 +5316,31 @@@ msgstr " Sériové číslo karty =
msgid "caching keyring '%s'\n"
msgstr "zapamatovává se soubor klíčů „%s“\n"
+#: g10/keyring.c:1541
- #, fuzzy, c-format
- #| msgid "%lu keys cached so far (%lu signatures)\n"
+ #, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
- msgstr[0] "%lu klíčů již uloženo v keši (%lu podpisů)\n"
- msgstr[1] "%lu klíčů již uloženo v keši (%lu podpisů)\n"
+ msgstr[0] "%lu klíčů již uloženo v keši (%lu podpis)\n"
+ msgstr[1] "%lu klíčů již uloženo v keši (%lu podpisy)\n"
msgstr[2] "%lu klíčů již uloženo v keši (%lu podpisů)\n"
+#: g10/keyring.c:1557
- #, fuzzy, c-format
- #| msgid "flush the cache"
+ #, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
- msgstr[0] "vyprázdní keš"
- msgstr[1] "vyprázdní keš"
- msgstr[2] "vyprázdní keš"
+ msgstr[0] "%lu klíč uložen v keši"
+ msgstr[1] "%lu klíče uloženy v keši"
+ msgstr[2] "%lu klíčů uloženo v keši"
+#: g10/keyring.c:1559
- #, fuzzy, c-format
- #| msgid "1 bad signature\n"
+ #, c-format
msgid " (%lu signature)\n"
msgid_plural " (%lu signatures)\n"
- msgstr[0] "1 špatný podpis\n"
- msgstr[1] "1 špatný podpis\n"
- msgstr[2] "1 špatný podpis\n"
+ msgstr[0] " (%lu podpis)\n"
+ msgstr[1] " (%lu podpisy)\n"
+ msgstr[2] " (%lu podpisů)\n"
+#: g10/keyring.c:1635
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: soubor klíčů (keyring) vytvořen\n"
@@@ -5478,16 -4222,13 +5391,15 @@@ msgstr "neplatný protokol serveru klí
msgid "\"%s\" not a key ID: skipping\n"
msgstr "„%s“ není ID klíče: přeskočeno\n"
+#: g10/keyserver.c:1423 g10/keyserver.c:1456
- #, fuzzy, c-format
- #| msgid "refreshing %d keys from %s\n"
+ #, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
- msgstr[0] "aktualizuji %d klíčů z %s\n"
- msgstr[1] "aktualizuji %d klíčů z %s\n"
- msgstr[2] "aktualizuji %d klíčů z %s\n"
+ msgstr[0] "aktualizuje se %d klíč z %s\n"
+ msgstr[1] "aktualizují se %d klíče z %s\n"
+ msgstr[2] "aktualizuje se %d klíčů z %s\n"
+#: g10/keyserver.c:1430
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "VAROVÁNÍ: nelze aktualizovat klíč %s prostřednictvím %s: %s\n"
@@@ -5505,23 -4243,17 +5417,21 @@@ 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:1709
#, c-format
msgid "requesting key %s from %s server %s\n"
- msgstr "požaduji klíč %s ze %s server %s\n"
+ msgstr "požaduji klíč %s z %s serveru %s\n"
+#: g10/keyserver.c:1713
#, c-format
msgid "requesting key %s from %s\n"
msgstr "požaduji klíč %s z %s\n"
+#: 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"
+ msgstr "není znám žádný server s klíči\n"
+#: 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"
@@@ -5688,13 -4387,10 +5598,12 @@@ msgstr " použití %s kl�
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:1808
- #, fuzzy, c-format
- #| msgid " aka \"%s\""
+ #, c-format
msgid " issuer \"%s\"\n"
- msgstr " alias „%s“"
+ msgstr " vydavatel „%s“\n"
+#: g10/mainproc.c:1825
msgid "Key available at: "
msgstr "Klíč k dispozici na: "
@@@ -5707,13 -4401,10 +5616,12 @@@ msgstr "[nejistý]
msgid " aka \"%s\""
msgstr " alias „%s“"
+#: g10/mainproc.c:2176
- #, fuzzy, c-format
- #| msgid "WARNING: This key is not certified with a trusted signature!\n"
+ #, c-format
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"
+ msgstr "POZOR: Tento klíč se nehodí na podepisování v režimu %s\n"
+#: g10/mainproc.c:2194
#, c-format
msgid "Signature expired %s\n"
msgstr "Platnost podpisu skončila %s\n"
@@@ -5811,23 -4482,17 +5719,21 @@@ msgstr "VAROVÁNÍ: vyžádaný algorit
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Poznámka: podpisy používající algoritmus %s jsou zamítány\n"
+#: g10/misc.c:375
- #, fuzzy, c-format
- #| msgid "%s:%u: read error: %s\n"
+ #, c-format
msgid "(reported error: %s)\n"
- msgstr "%s:%u: chyba čtení: %s\n"
+ msgstr "(nahlášená chyba: %s)\n"
+#: g10/misc.c:378
- #, fuzzy, c-format
- #| msgid "read error in '%s': %s\n"
+ #, c-format
msgid "(reported error: %s <%s>)\n"
- msgstr "chyba při čtení v „%s“: %s\n"
+ msgstr "(nahlášená chyba: %s <%s>)\n"
+#: g10/misc.c:397
msgid "(further info: "
- msgstr ""
+ msgstr "(podrobnosti: "
+#: g10/misc.c:1059
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: použití parametru „%s“ se nedoporučuje\n"
@@@ -6036,23 -4661,18 +5942,23 @@@ msgstr "Je tato fotografie správná (a
msgid "unable to display photo ID!\n"
msgstr "nelze zobrazit photo ID!\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Důvod nebyl specifikován"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "Klíč je nahrazen"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "Klíč byl zkompromitován"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "Klíč se již nepoužívá"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "Identifikátor uživatele již neplatí"
@@@ -6128,7 -4735,6 +6034,7 @@@ msgstr "
"Minimální úroveň důvěry tohoto klíče je: %s\n"
"\n"
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Vaše rozhodnutí? "
@@@ -6158,29 -4758,19 +6064,22 @@@ msgstr "Tento klíč pravděpodobně n�
msgid "This key belongs to us\n"
msgstr "Tento klíč náleží nám (máme odpovídající tajný klíč)\n"
+#: g10/pkclist.c:456
- #, fuzzy, c-format
- #| msgid "root certificate has now been marked as trusted\n"
+ #, c-format
msgid "%s: This key is bad! It has been marked as untrusted!\n"
- msgstr "kořenový certifikát byl nyní označen za důvěryhodný\n"
+ msgstr "%s: Tento klíč je špatný! Byl označen jako nedůvěryhodný!\n"
+#: g10/pkclist.c:484
- #, fuzzy
- #| msgid ""
- #| "It is NOT certain that the key belongs to the person named\n"
- #| "in the user ID. If you *really* know what you are doing,\n"
- #| "you may answer the next question with yes.\n"
msgid ""
"This key is bad! It has been marked as untrusted! If you\n"
"*really* know what you are doing, you may answer the next\n"
"question with yes.\n"
msgstr ""
- "NENÍ jisté, zda tento klíč patří osobě, jejíž jméno je uvedeno\n"
- "v uživatelském ID. Pokud *skutečně* víte, co děláte, můžete na\n"
- "následující otázku odpovědět ano\n"
- "\n"
+ "Tento klíč je špatný! Byl označen jako nedůvěryhodný!\n"
+ "Pokud *skutečně* víte, co děláte, můžete na\n"
+ "následující otázku odpovědět ano.\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"
@@@ -6188,10 -4778,8 +6087,9 @@@
msgstr ""
"NENÍ jisté, zda tento klíč patří osobě, jejíž jméno je uvedeno\n"
"v uživatelském ID. Pokud *skutečně* víte, co děláte, můžete na\n"
- "následující otázku odpovědět ano\n"
- "\n"
+ "následující otázku odpovědět ano.\n"
+#: g10/pkclist.c:508
msgid "Use this key anyway? (y/N) "
msgstr "Použít přesto tento klíč? (a/N) "
@@@ -6273,47 -4843,36 +6171,45 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Není jisté, zda tento podpis patří vlastníkovi.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: přeskočeno: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: přeskočeno: veřejný klíč je neplatný (disabled)\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: přeskočeno: veřejný klíč je již obsažen v databázi\n"
- #: g10/pkclist.c:990
- #, fuzzy, c-format
- #| msgid "can't connect to '%s': %s\n"
++#: g10/pkclist.c:985
+ #, c-format
msgid "can't encrypt to '%s'\n"
- msgstr "nelze se připojit k „%s“: %s\n"
+ msgstr "nelze zašifrovat pro „%s“\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "zadána volba „%s“, ale nezadány žádné platné výchozí klíče\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "zadána volba „%s“, ale chybí volba „%s“\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
- msgstr ""
- "Nespecifikoval jste identifikátor uživatele (user ID). Můžete použít \"-r\"\n"
+ msgstr "Nezadali jste identifikátor uživatele (můžete použít \"-r\")\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr "Aktuální příjemci:\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6321,37 -4880,29 +6217,37 @@@ msgstr "
"\n"
"Napište identifikátor uživatele (user ID). Ukončete prázdným řádkem: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Takový identifikátor uživatele neexistuje.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "přeskočeno: veřejný klíč je už nastaven podle implicitního adresáta\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "Veřejný klíč je neplatný (disabled).\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "přeskočeno: veřejný klíč je již nastaven\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "neznámý implicitní adresát „%s“\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "žádné platné adresy\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Poznámka: klíči %s chybí vlastnost %s\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Poznámka: klíči %s chybí předvolby pro %s\n"
@@@ -6387,22 -4931,17 +6283,21 @@@ 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:98 g10/pubkey-enc.c:139 sm/decrypt.c:493
- #, fuzzy, c-format
- #| msgid "certificate is not usable for encryption\n"
+ #, c-format
msgid "key %s is not suitable for decryption in %s mode\n"
- msgstr "certifikát není použitelný pro šifrování\n"
+ msgstr "klíč %s se nehodí na rozšifrování v režimu %s\n"
+#: g10/pubkey-enc.c:131
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
- msgstr "anonymní adresát; zkouším tajný klíč %s…\n"
+ msgstr "anonymní adresát; zkusí se tajný klíč %s…\n"
+#: g10/pubkey-enc.c:150
msgid "okay, we are the anonymous recipient.\n"
- msgstr "o.k., my jsme anonymní adresát.\n"
+ msgstr "dobrá, my jsme anonymní adresát.\n"
+#: g10/pubkey-enc.c:310
msgid "old encoding of the DEK is not supported\n"
msgstr "staré kódování DEK není podporováno\n"
@@@ -6452,7 -4980,6 +6347,7 @@@ msgstr "Tajný klíč není dostupný.\
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Vytvořit pro tento klíč pověřený revokační certifikát? (a/N)"
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "nařízen výstup do formátu ASCII.\n"
@@@ -6470,24 -4994,18 +6365,21 @@@ msgstr "Revokační certifikát vytvoř
msgid "no revocation keys found for \"%s\"\n"
msgstr "pro „%s“ nebyl nalezen žádný revokační klíč\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Toto je revokační certifikát pro OpenPGP klíč:"
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
+ "Odovolací certifikát je svým způsoben „bezpečnostní vypínač“, který\n"
+ "veřejně prohlašuje, že klíč by se již neměl používat. Jednou zveřejněný\n"
+ "odvolací certifikát již nelze vzít zpět."
- #: g10/revoke.c:571
- #, fuzzy
- #| 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."
++#: g10/revoke.c:584
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"
@@@ -6497,30 -5015,25 +6389,28 @@@
msgstr ""
"Použijte jej pro odvolání tohoto klíče v případě zneužití nebo ztráty\n"
"soukromého klíče. Avšak bude-li soukromý klíč stále přístupný, bude\n"
- "lepší vytvořit nový revokační certifikát s vysvětlením odvolání."
+ "lepší vytvořit nový odvolací certifikát s odůvodněním odvolání.\n"
+ "Podrobnosti naleznete v manuálu GnuPG u popisu příkazu\n"
+ "„gpg --generate-revocation“."
- #: g10/revoke.c:577
- #, fuzzy
- #| msgid ""
- #| "To avoid an accidental use of this file, a colon has been inserted\n"
- #| "before the 5 dashes below. Remove this colon with a text editor\n"
- #| "before making use of this revocation certificate."
++#: g10/revoke.c:590
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 ""
- "Aby se zabránilo nechtěnému použití tohoto souboru, před 5 pomlček byla\n"
- "vložena dvojtečka. Před použitím tohoto revokačního certifikátu odstraňte\n"
- "tuto dvojtečku textovým editorem."
+ "Aby se zabránilo nechtěnému použití tohoto souboru, níže před 5 pomlček "
+ "byla\n"
+ "vložena dvojtečka. Před importem a zveřejněním tohoto odvolacího "
+ "certifikátu\n"
+ "odstraňte tuto dvojtečku textovým editorem."
- #: g10/revoke.c:596
- #, fuzzy, c-format
- #| msgid "Revocation certificate created.\n"
++#: g10/revoke.c:609
+ #, c-format
msgid "revocation certificate stored as '%s.rev'\n"
- msgstr "Revokační certifikát vytvořen.\n"
+ msgstr "odvolací certifikát uložen jako „%s.rev“\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, c-format
msgid "secret key \"%s\" not found\n"
msgstr "tajný klíč „%s“ nenalezen\n"
@@@ -6528,21 -5041,17 +6418,21 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr "„%s“ odpovídá více tajným klíčům:\n"
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, c-format
msgid "error searching the keyring: %s\n"
msgstr "chyba při prohledávání souboru klíčů (keyring): %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Vytvořit pro tento klíč revokační certifikát? (a/N) "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6561,33 -5070,26 +6451,33 @@@ msgstr "
"na vašem počítači může ukládat data určená k tisku a zpřístupnit je\n"
"jiným uživatelům!\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Prosím vyberte důvod revokace:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Zrušit"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Pravděpodobně zda chcete vybrat %d)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Můžete vložit další popis. Ukončete prázdným řádkem:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Důvod revokace: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(Nebyl zadán Žádný popis)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
msgid "Is this okay? (y/N) "
msgstr "Je důvod revokace vybrán správně? (a/N) "
@@@ -6616,13 -5113,10 +6506,12 @@@ msgstr "%s klíč %s vyžaduje hash o
msgid "WARNING: signature digest conflict in message\n"
msgstr "VAROVÁNÍ: konflikt hashe podpisu ve zprávě\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"
+ #, c-format
msgid "key %s may not be used for signing in %s mode\n"
- msgstr "použití %s není v módu %s dovoleno\n"
+ msgstr "klíč %s se nesmí používat v režimu %s\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"
@@@ -6637,60 -5129,49 +6526,54 @@@ msgstr "více informací naleznete na a
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:324
- #, fuzzy, c-format
- #| msgid "public key %s is %lu second newer than the signature\n"
+ #, 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] "veřejný klíč %s je o %lu sekund novější než podpis\n"
- msgstr[1] "veřejný klíč %s je o %lu sekund novější než podpis\n"
+ msgstr[0] "veřejný klíč %s je o %lu sekundu novější než podpis\n"
+ msgstr[1] "veřejný klíč %s je o %lu sekundy novější než podpis\n"
msgstr[2] "veřejný klíč %s je o %lu sekund novější než podpis\n"
+#: g10/sig-check.c:333
- #, fuzzy, c-format
- #| msgid "public key %s is %lu second newer than the signature\n"
+ #, 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] "veřejný klíč %s je o %lu sekund novější než podpis\n"
- 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"
+ msgstr[0] "veřejný klíč %s je o %lu den novější než podpis\n"
+ msgstr[1] "veřejný klíč %s je o %lu dny novější než podpis\n"
+ msgstr[2] "veřejný klíč %s je o %lu dnů novější než podpis\n"
+#: 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"
+ #, 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] ""
- "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"
+ "klíč %s byl vytvořen %lu sekundu v budoucnosti (došlo ke změně času nebo\n"
+ "je problém s hodinami)\n"
msgstr[1] ""
- "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"
+ "klíč %s byl vytvořen %lu sekundy v budoucnosti (došlo ke změně času nebo\n"
+ "je problém s hodinami)\n"
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"
+ "je problém s hodinami)\n"
+#: g10/sig-check.c:356
- #, fuzzy, c-format
- #| msgid ""
- #| "key %s was created %lu second in the future (time warp or clock problem)\n"
+ #, 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] ""
- "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"
+ "klíč %s byl vytvořen %lu den v budoucnosti (došlo ke změně času nebo\n"
+ "je problém s hodinami)\n"
msgstr[1] ""
- "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"
+ "klíč %s byl vytvořen %lu dny v budoucnosti (došlo ke změně času nebo\n"
+ "je problém s hodinami)\n"
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"
+ "klíč %s byl vytvořen %lu dnů v budoucnosti (došlo ke změně času nebo\n"
+ "je problém s hodinami)\n"
+#: 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"
@@@ -6972,405 -5399,321 +6855,386 @@@ 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:231 g10/tofu.c:255 g10/tofu.c:674
- #, fuzzy, c-format
- #| msgid "error sending standard options: %s\n"
+ #, c-format
msgid "error beginning transaction on TOFU database: %s\n"
- msgstr "chyba při odesílání standardního parametru: %s\n"
+ msgstr "chyba při zahájení transakce v databázi TOFU: %s\n"
+#: g10/tofu.c:301 g10/tofu.c:324 g10/tofu.c:898
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
- msgstr ""
+ msgstr "chyba při potvrzování transakce v datázi TOFU: %s\n"
+#: g10/tofu.c:354 g10/tofu.c:887
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
- msgstr ""
+ msgstr "chyba při odvolávání transakce v databázi TOFU: %s\n"
+#: g10/tofu.c:504
- #, fuzzy, c-format
- #| msgid "unsupported algorithm: %s"
+ #, c-format
msgid "unsupported TOFU database version: %s\n"
- msgstr "nepodporovaný algoritmus: %s"
+ msgstr "nepodporovaná verze databáze TOFU: %s\n"
+#: g10/tofu.c:537
- #, fuzzy, c-format
- #| msgid "error creating temporary file: %s\n"
+ #, c-format
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
- msgstr "chyba při vytváření dočasného souboru: %s\n"
+ msgstr "chyba při vytváření TOFU tabulky „ultimately_trusted_keys“: %s\n"
+#: 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 ""
+ msgstr "Chyba databáze TOFU"
+#: 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"
++#: g10/tofu.c:3408
+ #, c-format
msgid "error reading TOFU database: %s\n"
- msgstr "chyba při odesílání dat: %s\n"
+ msgstr "chyba při čtení databáze TOFU: %s\n"
+#: g10/tofu.c:715 g10/tofu.c:723
- #, fuzzy, c-format
- #| msgid "error writing base64 encoding: %s\n"
+ #, c-format
msgid "error determining TOFU database's version: %s\n"
- msgstr "chyba při zápisu kódování base64: %s\n"
+ msgstr "chyba při zjišťování databáze TOFU: %s\n"
+#: 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"
+ #, c-format
msgid "error initializing TOFU database: %s\n"
- msgstr "chyba při inicializaci čtecího objektu: %s\n"
+ msgstr "chyba při inicializaci databáze TOFU: %s\n"
+#: g10/tofu.c:843
- #, fuzzy, c-format
- #| msgid "error sending data: %s\n"
+ #, c-format
msgid "error creating 'encryptions' TOFU table: %s\n"
- msgstr "chyba při odesílání dat: %s\n"
+ msgstr "chyba při vytváření TOFU tabulky „encryptions“: %s\n"
+ # ??? Typo: error adding
+#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
- msgstr ""
+ msgstr "přidávání sloupce effective_policy do vazeb databáze: %s\n"
+#: g10/tofu.c:955
- #, fuzzy, c-format
- #| msgid "error opening '%s': %s\n"
+ #, c-format
msgid "error opening TOFU database '%s': %s\n"
- msgstr "chyba při otevírání „%s“: %s\n"
+ msgstr "chyba při otevírání databáze TOFU „%s“: %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
- #, fuzzy, c-format
- #| msgid "error sending data: %s\n"
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
+ #, c-format
msgid "error updating TOFU database: %s\n"
- msgstr "chyba při odesílání dat: %s\n"
+ msgstr "chyba při aktualizaci databáze TOFU: %s\n"
+#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
- msgstr ""
+ msgstr "Toto je poprvé, co se e-mailová adresa „%s“ používá s klíčem %s."
+#: 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] ""
- msgstr[2] ""
+ msgstr[0] "E-mailová adresa „%s“ je přidružena k %d klíči!"
+ msgstr[1] "E-mailová adresa „%s“ je přidružena k %d klíčům!"
+ msgstr[2] "E-mailová adresa „%s“ je přidružena k %d klíčům!"
+#: g10/tofu.c:1342
msgid " Since this binding's policy was 'auto', it has been changed to 'ask'."
msgstr ""
+ " Protože pravidlo této vazby bylo „auto“, bylo změněno na „ask“ (zeptat se)."
+#: 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 ""
+ "Prosím naznačte, jestli tato e-mailová adresa má být spojována s klíčem %s "
+ "nebo jestli si mylíste, že někdo se vydává za „%s“\n"
+ "."
+#: g10/tofu.c:1608
- #, fuzzy, c-format
- #| msgid "error getting responder ID: %s\n"
+ #, c-format
msgid "error gathering other user IDs: %s\n"
- msgstr "chyba při zjišťování ID odpovídače: %s\n"
+ msgstr "chyba při sběru dalších ID uživetele: %s\n"
+#: 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ů"
+ msgstr "ID uživatelů tohoto klíče:\n"
+#: g10/tofu.c:1634 g10/tofu.c:1799
- #, fuzzy, c-format
- #| msgid "validity: %s"
+ #, c-format
msgid "policy: %s"
- msgstr "platnost: %s"
+ msgstr "politika: %s"
+#: g10/tofu.c:1725
- #, fuzzy, c-format
- #| msgid "error getting stored flags: %s\n"
+ #, c-format
msgid "error gathering signature stats: %s\n"
- msgstr "chyba při získání uložených příznaků: %s\n"
+ msgstr "chyba při sběru údajů o podpisech: %s\n"
+#: 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] ""
- msgstr[2] ""
+ msgstr[0] "E-mailová adresa „%s“ je spojena s %d klíčem:\n"
+ msgstr[1] "E-mailová adresa „%s“ je spojena s %d klíči:\n"
+ msgstr[2] "E-mailová adresa „%s“ je spojena s %d klíči:\n"
+#: g10/tofu.c:1747
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
- msgstr ""
+ msgstr "Statistika pro klíče s e-mailovou adresou „%s“:\n"
+#: g10/tofu.c:1797
- #, fuzzy
- #| msgid "list keys"
msgid "this key"
- msgstr "vypsat seznam klíčů"
+ msgstr "tento klíč"
+#: g10/tofu.c:1823
- #, fuzzy, c-format
- #| msgid "print message digests"
+ #, c-format
msgid "Verified %d message."
msgid_plural "Verified %d messages."
- msgstr[0] "vypsat hash zprávy"
- msgstr[1] "vypsat hash zprávy"
- msgstr[2] "vypsat hash zprávy"
+ msgstr[0] "%d zpráva ověřena."
+ msgstr[1] "%d zprávy ověřeny."
+ msgstr[2] "%d zpráv ověřeno."
+#: g10/tofu.c:1827
- #, fuzzy, c-format
- #| msgid "encrypted with %lu passphrases\n"
+ #, c-format
msgid "Encrypted %d message."
msgid_plural "Encrypted %d messages."
- msgstr[0] "zašifrováno s heslem %lu\n"
- msgstr[1] "zašifrováno s heslem %lu\n"
- msgstr[2] "zašifrováno s heslem %lu\n"
+ msgstr[0] "%d zpráva zašifrována."
+ msgstr[1] "%d zprávy zašifrovýny."
+ msgstr[2] "%d zpráv zašifrováno."
+#: g10/tofu.c:1834
- #, fuzzy, c-format
- #| msgid "print message digests"
+ #, c-format
msgid "Verified %d message in the future."
msgid_plural "Verified %d messages in the future."
- msgstr[0] "vypsat hash zprávy"
- msgstr[1] "vypsat hash zprávy"
- msgstr[2] "vypsat hash zprávy"
+ msgstr[0] "Ověřena %d zpráva v budoucnosti."
+ msgstr[1] "Ověřeny %d zprávy v budoucnosti."
+ msgstr[2] "Ověřeno %d zpráv v budoucnosti."
+#: g10/tofu.c:1838
- #, fuzzy, c-format
- #| msgid "print message digests"
+ #, c-format
msgid "Encrypted %d message in the future."
msgid_plural "Encrypted %d messages in the future."
- msgstr[0] "vypsat hash zprávy"
- msgstr[1] "vypsat hash zprávy"
- msgstr[2] "vypsat hash zprávy"
+ msgstr[0] "Zašifrována %d zpráva v budoucnosti."
+ msgstr[1] "Zašifrovány %d zprávy v budoucnosti."
+ msgstr[2] "Zašifrováno %d zpráv v budoucnosti."
+#: 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] ""
- msgstr[2] ""
+ msgstr[0] "Ověřeno zpráv za poslední %d den: %d."
+ msgstr[1] "Ověřeno zpráv za poslední %d dny: %d."
+ msgstr[2] "Ověřeno zpráv za posledních %d dnů: %d."
+#: 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] ""
- msgstr[2] ""
+ msgstr[0] "Zašifrováno zpráv za poslední %d den: %d."
+ msgstr[1] "Zašifrováno zpráv za poslední %d dny: %d."
+ msgstr[2] "Zašifrováno zpráv za posledních %d dnů: %d."
+#: 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] ""
- msgstr[2] ""
+ msgstr[0] "Ověřeno zpráv za poslední %d měsíc: %d."
+ msgstr[1] "Ověřeno zpráv za poslední %d měsíce: %d."
+ msgstr[2] "Ověřeno zpráv za posledních %d měsíců: %d."
+#: 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] ""
- msgstr[2] ""
+ msgstr[0] "Zašifrováno zpráv za poslední %d měsíc: %d."
+ msgstr[1] "Zašifrováno zpráv za poslední %d měsíce: %d."
+ msgstr[2] "Zašifrováno zpráv za posledních %d měsíců: %d."
+#: 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] ""
- msgstr[2] ""
+ msgstr[0] "Zpráv ověřeno za poslední %d rok: %d."
+ msgstr[1] "Zpráv ověřeno za poslední %d roky: %d."
+ msgstr[2] "Zpráv ověřeno za posledních %d roků: %d."
+#: 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] ""
- msgstr[2] ""
+ msgstr[0] "Ověřeno zpráv za poslední %d rok: %d."
+ msgstr[1] "Ověřeno zpráv za poslední %d roky: %d."
+ msgstr[2] "Ověřeno zpráv za posledních %d roků: %d."
+#: g10/tofu.c:1898
#, c-format
msgid "Messages verified in the past: %d."
- msgstr ""
+ msgstr "Zpráv ověřeno v minulosti: %d."
+#: g10/tofu.c:1902
- #, fuzzy, c-format
- #| msgid "print message digests"
+ #, c-format
msgid "Messages encrypted in the past: %d."
- msgstr "vypsat hash zprávy"
+ msgstr "Zpráv zašifrovno v minulosti: %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:1919
msgid "TOFU detected a binding conflict"
- msgstr ""
+ msgstr "TOFU objevilo konflikt ve vazbě"
#. 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:1961
msgid "gGaAuUrRbB"
- msgstr ""
+ msgstr "gGaAuUrRbB"
+#: g10/tofu.c:1967
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
- msgstr ""
+ msgstr "(D)obrý, (P)řijmout jednou, (N)eznámý, (O)dmítnout jednou, špa(T)ný? "
+#: g10/tofu.c:1975
msgid "Defaulting to unknown.\n"
- msgstr ""
+ msgstr "Použíje se výchozí volba neznýmý.\n"
+#: g10/tofu.c:2090 g10/tofu.c:2226
msgid "TOFU db corruption detected.\n"
- msgstr ""
+ msgstr "Zjistěno poškození databýze TOFU.\n"
+#: g10/tofu.c:2146
- #, fuzzy, c-format
- #| msgid "error writing key: %s\n"
+ #, c-format
msgid "resetting keydb: %s\n"
- msgstr "chyba při zápisu klíče: %s\n"
+ msgstr "databáze klíčů se resetuje: %s\n"
+#: g10/tofu.c:2613
- #, fuzzy, c-format
- #| msgid "error setting OCSP target: %s\n"
+ #, c-format
msgid "error setting TOFU binding's policy to %s\n"
- msgstr "chyba při nastavování cíle OCSP: %s\n"
+ msgstr "chyba při nastavování politiky vazby TOFU na %s\n"
+#: g10/tofu.c:2826
- #, fuzzy, c-format
- #| msgid "error creating a pipe: %s\n"
+ #, c-format
msgid "error changing TOFU policy: %s\n"
- msgstr "chyba při vytváření roury: %s\n"
+ msgstr "chyba při měnění politiky TOFU: %s\n"
+ # These strings are used as an argument in "Verified 2 signatures in past %s."
+#: g10/tofu.c:2877
#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
+ msgstr[0] "%lld~roku"
+ msgstr[1] "%lld~roků"
+ msgstr[2] "%lld~roků"
+#: g10/tofu.c:2882
#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
+ msgstr[0] "%lld~měsíce"
+ msgstr[1] "%lld~měsíců"
+ msgstr[2] "%lld~měsíců"
+#: g10/tofu.c:2887
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
+ msgstr[0] "%lld~týdne"
+ msgstr[1] "%lld~týdnů"
+ msgstr[2] "%lld~týdnů"
+#: g10/tofu.c:2892
#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
+ msgstr[0] "%lld~dne"
+ msgstr[1] "%lld~dnů"
+ msgstr[2] "%lld~dnů"
+#: g10/tofu.c:2897
#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
+ msgstr[0] "%lld~hodiny"
+ msgstr[1] "%lld~hodin"
+ msgstr[2] "%lld~hodin"
+#: g10/tofu.c:2902
#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
+ msgstr[0] "%lld~minuty"
+ msgstr[1] "%lld~minut"
+ msgstr[2] "%lld~minut"
+#: g10/tofu.c:2904
#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
+ msgstr[0] "%lld~sekundy"
+ msgstr[1] "%lld~sekund"
+ msgstr[2] "%lld~sekund"
+#: g10/tofu.c:3142
#, c-format
msgid "%s: Verified 0~signatures and encrypted 0~messages."
- msgstr ""
+ msgstr "%s: Ověřeno 0~podpisů a zašifrováno 0~zpráv."
+#: g10/tofu.c:3148
- #, fuzzy, c-format
- #| msgid "Deleted %d signatures.\n"
+ #, c-format
msgid "%s: Verified 0 signatures."
- msgstr "Smazáno %d podpisů.\n"
+ msgstr "%s: Ověřeno 0 podpisů."
+ # The final %s is replaced by a string like "7~months".
+#: g10/tofu.c:3156
- #, fuzzy, c-format
- #| msgid "print message digests"
+ #, c-format
msgid "%s: Verified %ld~signature in the past %s."
msgid_plural "%s: Verified %ld~signatures in the past %s."
- msgstr[0] "vypsat hash zprávy"
- msgstr[1] "vypsat hash zprávy"
- msgstr[2] "vypsat hash zprávy"
+ msgstr[0] "%s: Ověřen %ld~podpis za poslední období %s."
+ msgstr[1] "%s: Ověřeny %ld~podpisy za poslední období %s."
+ msgstr[2] "%s: Ověřeno %ld~podpisů za poslední období %s."
+#: g10/tofu.c:3166
- #, fuzzy
- #| msgid "encrypted with %lu passphrases\n"
msgid "Encrypted 0 messages."
- msgstr "zašifrováno s heslem %lu\n"
+ msgstr "Zašifrováno 0 zpráv."
+#: g10/tofu.c:3174
- #, fuzzy, c-format
- #| msgid "print message digests"
+ #, c-format
msgid "Encrypted %ld~message in the past %s."
msgid_plural "Encrypted %ld~messages in the past %s."
- msgstr[0] "vypsat hash zprávy"
- msgstr[1] "vypsat hash zprávy"
- msgstr[2] "vypsat hash zprávy"
+ msgstr[0] "Zašifrována %ld~zpráva za poslední období %s."
+ msgstr[1] "Zašifrovány %ld~zprávy za poslední období %s."
+ msgstr[2] "Zašifrováno %ld~zpráv za poslední období %s."
+#: g10/tofu.c:3185
- #, fuzzy, c-format
- #| msgid "validity: %s"
+ #, c-format
msgid "(policy: %s)"
- msgstr "platnost: %s"
+ msgstr "(politika: %s)"
+#: g10/tofu.c:3219
msgid ""
"Warning: we have yet to see a message signed using this key and user id!\n"
msgstr ""
+ "Pozor: ještě musíme vidět zprávu podepsanou tímto klíčem a idenitou "
+ "uživatele!\n"
+#: g10/tofu.c:3222
msgid ""
"Warning: we've only seen one message signed using this key and user id!\n"
msgstr ""
+ "Pozor: viděli jsme pouze jednu zprávu podepsanou tímto klíčem a idenitou\n"
+ "uživatele!\n"
+#: g10/tofu.c:3226
msgid "Warning: you have yet to encrypt a message to this key!\n"
- msgstr ""
+ msgstr "Pozor: ješte je třeba zašifrovat zprávu tímto klíčem!\n"
+#: g10/tofu.c:3229
msgid "Warning: you have only encrypted one message to this key!\n"
- msgstr ""
+ msgstr "Pozor: tímto klíčem jste zašifrovali pouze jednu zprávu!\n"
+#: g10/tofu.c:3258
#, c-format
msgid ""
"Warning: if you think you've seen more signatures by this key and user id, "
@@@ -7385,28 -5728,38 +7249,43 @@@ msgid_plural "
" %s\n"
"to mark it as being bad.\n"
msgstr[0] ""
+ "Pozor: Pokud si myslíte, že jste viděli více podpisů tímto klíčem a "
+ "identitou uživatele, pak tento klíč může být podvrh! Pečlivě prozkoumejte e-"
+ "mailovou adresu. Jestliže je klíč podezřelý, použijte příkaz\n"
+ " %s\n"
+ "k označení, že je špatný.\n"
msgstr[1] ""
+ "Pozor: Pokud si myslíte, že jste viděli více podpisů tímto klíčem a s těmito "
+ "identitami uživatele, pak tento klíč může být podvrh! Pečlivě prozkoumejte e-"
+ "mailové adresy. Jestliže je klíč podezřelý, použijte příkaz\n"
+ " %s\n"
+ "k označení, že je špatný.\n"
msgstr[2] ""
+ "Pozor: Pokud si myslíte, že jste viděli více podpisů tímto klíčem a s těmito "
+ "identitami uživatele, pak tento klíč může být podvrh! Pečlivě prozkoumejte e-"
+ "mailové adresy. Jestliže je klíč podezřelý, použijte příkaz\n"
+ " %s\n"
+ "k označení, že je špatný.\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
- #, fuzzy, c-format
- #| msgid "error sending data: %s\n"
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
+ #, c-format
msgid "error opening TOFU database: %s\n"
- msgstr "chyba při odesílání dat: %s\n"
+ msgstr "chyba při otevírání databáze TOFU: %s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
+ "POZOR: Šifruje se pro %s, kterýžto nemá neodvolané identity uživatele\n"
- #: g10/tofu.c:3915
- #, fuzzy, c-format
- #| msgid "error writing public keyring '%s': %s\n"
++#: g10/tofu.c:3943
+ #, c-format
msgid "error setting policy for key %s, user id \"%s\": %s"
- msgstr "chyba při zápisu do souboru veřejných klíčů „%s“: %s\n"
+ msgstr ""
+ "chyba při nastavování politiky pro klíč %s a identitu uživatele „%s“: %s"
+#: g10/trustdb.c:216
#, c-format
msgid "'%s' is not a valid long keyID\n"
msgstr "„%s“ není platný dlouhý keyID\n"
@@@ -7464,7 -5806,6 +7343,7 @@@ msgstr "použití modelu důvěry %s\n
msgid "no need for a trustdb check\n"
msgstr "není nutné kontrolovat databázi důvěry\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "další kontrola databáze důvěry v %s\n"
@@@ -7492,34 -5828,27 +7371,32 @@@ msgstr "prosím proveďte --check-trust
msgid "checking the trustdb\n"
msgstr "kontroluji databázi důvěry\n"
- #: g10/trustdb.c:1957
- #, fuzzy, c-format
- #| msgid "%lu keys processed so far\n"
++#: g10/trustdb.c:1961
+ #, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
- msgstr[0] "%lu klíče byly doposud zpracovány\n"
- msgstr[1] "%lu klíče byly doposud zpracovány\n"
- msgstr[2] "%lu klíče byly doposud zpracovány\n"
+ msgstr[0] "zpracován %d klíč"
+ msgstr[1] "zpracovány %d klíče"
+ msgstr[2] "zpracováno %d klíčů"
- #: g10/trustdb.c:1960
- #, fuzzy, c-format
- #| msgid "%d keys processed (%d validity counts cleared)\n"
++#: g10/trustdb.c:1964
+ #, c-format
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
- msgstr[0] "zpracováno %d klíčů (%d validit vymazáno)\n"
- msgstr[1] "zpracováno %d klíčů (%d validit vymazáno)\n"
- msgstr[2] "zpracováno %d klíčů (%d validit vymazáno)\n"
+ msgstr[0] " (vymazáno %d počítadlo platnosti)\n"
+ msgstr[1] " (vymazána %d počítadla platnosti)\n"
+ msgstr[2] " (vymazáno %d počítadel platnosti)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "žádný absolutně důvěryhodný klíč nebyl nalezen\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "veřejný klíč k absolutně důvěryhodnému klíči %s nebyl nalezen\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7527,7 -5856,6 +7404,7 @@@ msgstr "
"hloubka: %d platných: %3d podepsaných: %3d důvěra: %d-, %dq, %dn, %dm, "
"%df, %du\n"
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "nelze aktualizovat záznam v databázi důvěry: chyba při zápisu: %s\n"
@@@ -7581,13 -5899,9 +7458,11 @@@ msgstr "[ neznámá ]
msgid "[ undef ]"
msgstr "[nedefinovaná]"
+#: g10/trust.c:179
- #, fuzzy
- #| msgid "never"
msgid "[ never ]"
- msgstr "žádná"
+ msgstr "[ nikdy ]"
+#: g10/trust.c:180
msgid "[marginal]"
msgstr "[ částečná ]"
@@@ -7723,21 -6010,15 +7598,19 @@@ msgstr "uložení data vytvoření se n
msgid "error retrieving CHV status from card\n"
msgstr "chyba při získání CHV z karty\n"
+#: scd/app-openpgp.c:1352
msgid "response does not contain the RSA modulus\n"
- msgstr "odpověď neobsahuje RSA modulus\n"
+ msgstr "odpověď neobsahuje modulus RSA\n"
+#: scd/app-openpgp.c:1359
msgid "response does not contain the RSA public exponent\n"
- msgstr "odpověď neobsahuje veřejný RSA exponent\n"
+ msgstr "odpověď neobsahuje veřejný exponent RSA\n"
+#: 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"
+ msgstr "odpověď neobsahuje veřejný klíč EC\n"
+#: 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"
@@@ -7749,42 -6029,32 +7622,39 @@@ msgstr "čtení veřejného klíče se
#. 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:2008
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
- msgstr ""
+ msgstr "%sČíslo : %s%%0ADržitel : %s%%0APočítadlo : %lu%s"
+#: scd/app-openpgp.c:2021
#, c-format
msgid "%sNumber : %s%%0AHolder : %s%s"
- msgstr ""
+ msgstr "%sČíslo : %s%%0ADržitel : %s%s"
#. TRANSLATORS: This is the number of remaining attempts to
#. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed.
+#: scd/app-openpgp.c:2037
#, c-format
msgid "Remaining attempts: %d"
- msgstr ""
+ msgstr "Zbývá pokusů: %d"
+#: scd/app-openpgp.c:2093
#, c-format
msgid "using default PIN as %s\n"
- msgstr "používám implicitní PIN jako %s\n"
+ msgstr "použije se výchozí PIN jako %s\n"
+#: 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"
+ "použití výchozího PINu jako %s selhalo: %s – vypínám jeho budoucí použití\n"
+#: scd/app-openpgp.c:2113
- #, fuzzy
- #| msgid "||Please enter the PIN"
msgid "||Please unlock the card"
- msgstr "||Prosím vložte PIN"
+ msgstr "||Prosím, odemkněte kartu"
+#: 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"
@@@ -7799,9 -6066,7 +7669,8 @@@ msgstr "ověření CHV%d se nezdařilo
msgid "card is permanently locked!\n"
msgstr "karta je trvale uzamčena!\n"
+#: scd/app-openpgp.c:2250
- #, fuzzy, c-format
- #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+ #, 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"
@@@ -7818,11 -6082,9 +7687,11 @@@ msgstr[2] "
msgid "|A|Please enter the Admin PIN"
msgstr "|A|Prosím, zadejte PIN správce"
+#: 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"
+ msgstr "přístup k příkazům správce není nakonfigurován\n"
+#: scd/app-openpgp.c:2586
msgid "||Please enter the PIN"
msgstr "||Prosím vložte PIN"
@@@ -7908,16 -6151,13 +7777,15 @@@ msgstr "prosím počkejte než bude kl�
msgid "generating key failed\n"
msgstr "generování klíče se nezdařilo\n"
+#: scd/app-openpgp.c:3989
- #, fuzzy, c-format
- #| msgid "key generation completed (%d seconds)\n"
+ #, c-format
msgid "key generation completed (%d second)\n"
msgid_plural "key generation completed (%d seconds)\n"
- msgstr[0] "generování klíče dokončeno (%d sekund)\n"
- msgstr[1] "generování klíče dokončeno (%d sekund)\n"
+ msgstr[0] "generování klíče dokončeno (%d sekunda)\n"
+ msgstr[1] "generování klíče dokončeno (%d sekundy)\n"
msgstr[2] "generování klíče dokončeno (%d sekund)\n"
+#: scd/app-openpgp.c:4023
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "neplatná struktura OpenPGP karty (DO 0x93)\n"
@@@ -7956,55 -6189,42 +7824,55 @@@ msgstr "||Prosím, zadejte svůj PIN n
msgid "|N|Initial New PIN"
msgstr "|N|Prvotní nový PIN"
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
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:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|ÚROVEŇ|nastaví ladicí úroveň na ÚROVEŇ"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
msgid "|FILE|write a log to FILE"
msgstr "|SOUBOR|zapisovat protokol do SOUBORU"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr "|N|připojit se na čtečku na portu N"
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
msgid "|NAME|use NAME as ct-API driver"
msgstr "NÁZEV|použít NÁZEV jako ovladač ct-API"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
msgid "|NAME|use NAME as PC/SC driver"
msgstr "NÁZEV|použít NÁZEV jako ovladač PC/SC"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
msgid "do not use the internal CCID driver"
msgstr "nepoužívat vnitřní ovladač CCID"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr "|N|odpojovat se od karty po N sekundách nečinnosti"
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr "nepoužívat klávesnici čtečky"
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
msgid "deny the use of admin card commands"
msgstr "zakázat používání správcovských příkazů karty"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr "používat vstup o proměnné délce na klávesnici čtečky"
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Použití: @SCDAEMON@ [volby] (-h pro nápovědu)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
@@@ -8012,17 -6232,14 +7880,17 @@@ msgstr "
"Syntaxe: scdaemon [volby] [příkaz [argumenty]]\n"
"Démon pro čipové karty (smartcard) pro @GNUPG@\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
"prosím, použijte volbu „--daemon“, chcete-li nechat běžet program na pozadí\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr "obsluha pro deskriptor %d spuštěna\n"
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "obsluha pro deskriptor %d ukončena\n"
@@@ -8707,7 -6771,6 +8575,7 @@@ msgstr "|SOUBOR|přidat klíčenku na s
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|ID_UŽIVATELE|použít ID_UŽIVATELE jako implicitní tajný klíč"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|použít tento server pro dohledávání klíčů"
@@@ -8762,17 -6815,14 +8630,17 @@@ msgstr "%s:%u: přeskakuji tento řáde
msgid "could not parse keyserver\n"
msgstr "nelze rozebrat serveru klíčů\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "importují se běžné certifikáty „%s“\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "nelze podepsat pomocí „%s“: %s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr "neplatný příkaz (neexistuje žádný implicitní příkaz)\n"
@@@ -9012,13 -7018,10 +8880,12 @@@ msgid " runtime cached certificates
msgstr "za běhu nakešovaných certifikátů: %u\n"
# XXX: Align with msgid "permanently loaded certificates:"
+#: dirmngr/certcache.c:815
- #, fuzzy, c-format
- #| msgid " runtime cached certificates: %u\n"
+ #, c-format
msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
- msgstr "za běhu nakešovaných certifikátů: %u\n"
+ msgstr " důvěryhodných certifikátů: %u (%u,%u,%u,%u)\n"
+#: dirmngr/certcache.c:843 dirmngr/dirmngr-client.c:385
msgid "certificate already cached\n"
msgstr "certifikát již v keši\n"
@@@ -9717,112 -7576,84 +9584,112 @@@ msgstr "očekáván absolutní název s
msgid "looking up '%s'\n"
msgstr "hledá se „%s“\n"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr "vypíše obsah CRL keše"
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
msgid "|FILE|load CRL from FILE into cache"
msgstr "|SOUBOR|zavede CRL ze SOUBORU do keše"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|stáhne CRL z URL"
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr "vypne dirmngr"
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr "vyprázdní keš"
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr "|SOUBOR|protokol z režimu serveru se zapíše do SOUBORU"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
msgid "run without asking a user"
msgstr "běží bez dotazování se uživatele"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr "vynutí zavedení zastaralých CRL"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr "povolí odesílání OCSP dotazů"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
- msgstr ""
+ msgstr "povolí kontrolu verze softwaru po síti"
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr "zakáže použití HTTP"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr "zakáže použití LDAP"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr "ignoruje HTTP distribuční místa CRL "
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr "ignoruje LDAP distribuční místa CRL"
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr "ignoruje URL služby OCSP uvedené v certifikátu"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|všechny HTTP požadavky přesměruje na URL"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr "|STROJ|pro LDAP dotazy použije STROJ"
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "nepoužije náhradní stroje s --ldap-proxy"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
msgid "|FILE|read LDAP server list from FILE"
msgstr "|SOUBOR|načte seznam LDAP serverů ze SOUBORU"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
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:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 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:216
++#: dirmngr/dirmngr.c:219
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|použije OCSP odpovídače na URL"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr "|OTISK|OCSP odpovědi podepsané podle OTISKU"
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
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:229
++#: dirmngr/dirmngr.c:232
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:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr "směrovat veškerý síťový provoz skrz Tor"
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9831,11 -7662,9 +9698,11 @@@ msgstr "
"@\n"
"(Úplný seznam příkazů a voleb naleznete v „info“ manuálu.)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Použití: @DIRMNGR@ [volby] (-h pro nápovědu)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9843,78 -7672,61 +9710,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:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "platné úrovně ladění jsou: %s\n"
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, c-format
msgid "usage: %s [options] "
msgstr "použití: %s [volby] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
msgid "colons are not allowed in the socket name\n"
msgstr "dvojtečky v názvu socketu jsou nepřípustné\n"
- #: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "stahování CRL z „%s“ selhalo: %s\n"
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "zpracování CRL z „%s“ selhalo: %s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, 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:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: zjištěn neplatný otisk\n"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: chyba čtení: %s\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, 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:1838
++#: dirmngr/dirmngr.c:1851
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:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr "přijat SIGUSR2 – žádná akce nedefinována\n"
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr "přijat SIGTERM – vypíná se…\n"
# TODO: plural
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "přijat SIGTERM – stále aktivních spojení: %d\n"
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
msgid "shutdown forced\n"
msgstr "vypnutí vynuceno\n"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr "přijat SIGINT – okamžité vypnutí\n"
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "přijat signál č. %d – žádná akce nedefinována\n"
@@@ -10340,76 -8061,60 +10207,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:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "volání assuan_inquire(%s) selhalo: %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr "chybí ldapserver (LDAP server)"
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr "v ID certifikátu chybí serialno (sériové číslo)"
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "volání assuan_inquire selhalo: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "volání fetch_cert_by_url selhalo: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, c-format
msgid "error sending data: %s\n"
msgstr "chyba při odesílání dat: %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "volání start_cert_fetch selhalo: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "volání fetch_next_cert selhalo: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies (max. odpovědí) %d překročeno\n"
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "řídící strukturu nelze alokovat: %s\n"
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "alokace kontextu assuan selhala: %s\n"
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "inicializace serveru selhala: %s\n"
- #: dirmngr/server.c:2632
++#: dirmngr/server.c:2738
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "registrace příkazu u Assuanu selhala: %s\n"
- #: dirmngr/server.c:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "problém příjmu Assuanu: %s\n"
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "zpracování Assuanu se nezdařilo: %s\n"
@@@ -10447,7 -8144,6 +10314,7 @@@ msgstr "řetěz certifikátů je v po�
msgid "certificate should not have been used for CRL signing\n"
msgstr "certifikát neměl být použit pro podepsání CRL\n"
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
msgid "quiet"
msgstr "stručný výstup"
@@@ -10538,275 -8214,192 +10405,257 @@@ 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr "Volby ovlivňující diagnostický výstup"
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr "Volby ovlivňující nastavení"
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr "Volby užitečné při ladění"
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr "Volby ovlivňující bezpečnost"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|zahazovat klíče SSH po N sekundách"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|nastavit maximální životnost dočasné paměti pro PINy na N sekund"
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N| nastavit maximální životnost klíčů SSH na N sekund"
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr "Volby vynucující politiku hesel"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
- msgstr "nedovolit obejít politiku hesel"
+ msgstr "nedovolit obejití politiky hesel"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|nastavit minimální vyžadovanou délku nových hesel na N"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|vyžaduje alespoň N nepísmenných znaků v novém hesle"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|SOUBOR|prověřovat nová hesla proti vzorům v SOUBORU"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
msgid "|N|expire the passphrase after N days"
msgstr "|N|omezit platnost hesla na N dnů"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
msgid "do not allow the reuse of old passphrases"
msgstr "nedovolit opakovat stará hesla"
- #: tools/gpgconf-comp.c:595
- #, fuzzy
- #| msgid "|N|set LDAP timeout to N seconds"
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
- msgstr "|N|nastaví časový limit pro LDAP na N sekund"
+ msgstr "|N|nastavit časový limit pro Pinentry na N sekund"
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NÁZEV|použít NÁZEV jako implicitní tajný klíč"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
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:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|nastavit e-mailový alias"
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr "Nastavení serverů klíčů"
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
msgid "|URL|use keyserver at URL"
msgstr "|URL|používat server klíčů na URL"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr "povolit dohledávání PKA (dotazy na DNS)"
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
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:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr "zakázat veškerý přístup k dirmngr"
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
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:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr "neprověřovat kořenové certifikáty proti CRL"
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr "Volby ovlivňující podobu výstupu"
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr "Volby ovlivňující interaktivitu a vymáhání"
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
msgstr "Volby ovlivňující použití Toru"
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr "Nastavení HTTP serverů"
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr "používat systémové nastavení HTTP proxy"
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr "Nastavení používaných LDAP serverů"
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr "Seznam LDAP serverů"
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr "Nastavení OCSP"
- #: tools/gpgconf-comp.c:1112
- #, fuzzy
- #| msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
- msgstr "GPG pro OpenPGP"
+ msgstr "OpenPGP"
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
- msgstr ""
+ msgstr "Soukromé klíče"
- #: tools/gpgconf-comp.c:1114
- #, fuzzy
- #| msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
- msgstr "Démon pro čipové karty"
+ msgstr "Čipové karty"
- #: tools/gpgconf-comp.c:1115
- #, fuzzy
- #| msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
- msgstr "GPG pro S/MIME"
+ msgstr "S/MIME"
- #: tools/gpgconf-comp.c:1116
- #, fuzzy
- #| msgid "network error"
++#: tools/gpgconf-comp.c:1120
msgid "Network"
- msgstr "chyba sítě"
+ msgstr "Síť"
- #: tools/gpgconf-comp.c:1117
- #, fuzzy
- #| msgid "PIN and Passphrase Entry"
++#: tools/gpgconf-comp.c:1121
msgid "Passphrase Entry"
- msgstr "Zadávání kódu PIN a hesla"
+ msgstr "Pole pro heslo"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
msgid "Component not suitable for launching"
msgstr "Komponenta není vhodná pro spuštění"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr "Selhalo externí ověření komponenty %s"
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
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:4165
- #, fuzzy, c-format
- #| msgid "error closing '%s': %s\n"
++#: tools/gpgconf-comp.c:4193
+ #, c-format
msgid "error closing '%s'\n"
- msgstr "chyba při uzavírání „%s“: %s\n"
+ msgstr "chyba při uzavírání „%s“\n"
- #: tools/gpgconf-comp.c:4167
- #, fuzzy, c-format
- #| msgid "error hashing '%s': %s\n"
++#: tools/gpgconf-comp.c:4195
+ #, c-format
msgid "error parsing '%s'\n"
- msgstr "chyba při výpočtu haše „%s“: %s\n"
+ msgstr "chyba při rozboru „%s“\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr "vypsat všechny komponenty"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr "zkontrolovat všechny programy"
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr "|KOMPONENTA|vypsat volby"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr "|KOMPONENTA|změnit volby"
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr "|KOMPONENTA|zkontrolovat volby"
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr "aplikovat globální implicitní hodnoty"
- #: tools/gpgconf.c:81
- #, fuzzy
- #| msgid "|FILE|take policy information from FILE"
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
- msgstr "|SOUBOR|vzít politiky ze SOUBORU"
+ msgstr "|SOUBOR|aktualizovat konfigurační soubory pomocí SOUBORU"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr "získat adresáře s nastavením @GPGCONF@"
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
msgid "list global configuration file"
msgstr "vypsat globální konfigurační soubor"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
msgid "check global configuration file"
msgstr "zkontrolovat globální konfigurační soubor"
- #: tools/gpgconf.c:89
- #, fuzzy
- #| msgid "update the trust database"
++#: tools/gpgconf.c:91
msgid "query the software version database"
- msgstr "aktualizovat databázi důvěry"
+ msgstr "dotázat se databázi verzí softwaru"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr "znovu načíst všechny nebo zadané komponenty"
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr "spustit zadanou komponentu"
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr "zabít zadanou komponentu"
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "použít jako výstupní soubor"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr "provést změny za běhu, pokud to lze"
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Použití: @GPGCONF@ [volby] (-h pro nápovědu)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10814,15 -8407,12 +10663,15 @@@ msgstr "
"Syntaxe: @GPGCONF@ [volby]\n"
"Spravuje konfigurační volby nástrojů, které patří do systému @GNUPG@\n"
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr "Potřebuji jeden argument určující komponentu"
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
msgid "Component not found"
msgstr "Komponenta nenalezena"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
msgid "No argument allowed"
msgstr "Žádné argumenty nejsou povoleny"
diff --cc po/da.po
index 669deff,e30e3b6..d94032d
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2017-11-02 17:39+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@@ -173,26 -144,11 +173,26 @@@ msgstr "Ugyldig adgangsfrase
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh-nøgler større end %d bit er ikke understøttet\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -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:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -427,144 -342,105 +427,144 @@@ msgstr "
"@Indstillinger:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr "kør i dæmontilstand (baggrunden)"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr "kør i servertilstand (forgrunden)"
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "run in server mode"
msgid "run in supervised mode"
msgstr "kør i servertilstand"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "uddybende"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "vær mindre uddybende"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr "kommandoresultat i sh-stil"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr "kommandoresultat i csh-stil"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|FIL|læs tilvalg fra FIL"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr "frakobl ikke fra konsollen"
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "brug en logfil for serveren"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|brug PGM som PIN-Entry-program"
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|brug PGM som SCdaemon-program"
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
msgid "do not use the SCdaemon"
msgstr "brug ikke SCdaemon'en"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, 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:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr "ignorer forespørgsler om at ændre TTY'en"
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr "ignorer forespørgsler om at ændre X-skærmen"
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|udløb mellemlagrede PIN'er efter N sekunder"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr "brug ikke PIN-mellemlageret når der underskrives"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, 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:231
++#: agent/gpg-agent.c:233
#, 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:234
++#: agent/gpg-agent.c:236
msgid "allow presetting passphrase"
msgstr "tillad forhåndsindstilling af adgangsfrase"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
#, fuzzy
#| msgid "enable ssh-agent emulation"
msgid "enable ssh support"
msgstr "aktiver ssh-agent-emulering"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
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:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
#, 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:515
++#: agent/gpg-agent.c:525
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -576,154 -452,113 +576,149 @@@ msgstr "
"Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
"Hemmelig nøglehåndtering for GnuPG\n"
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, 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:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "valgt sammendragsalgoritme er ugyldig\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 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:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, 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:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, c-format
msgid "can't create socket: %s\n"
msgstr "kan ikke oprette sokkel: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, 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:2209
++#: agent/gpg-agent.c:2232
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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
msgid "error getting nonce for the socket\n"
msgstr "fejl ved indhentelse af nonce for soklen\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, 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:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, 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:2241 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
- #, c-format
- msgid "listen() failed: %s\n"
- msgstr "listen() mislykkedes: %s\n"
-
- #: agent/gpg-agent.c:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, 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:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, 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:2327
++#: agent/gpg-agent.c:2351
#, 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:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, 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:2686
++#: agent/gpg-agent.c:2710
#, 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:2691
++#: agent/gpg-agent.c:2715
#, 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:2766
++#: agent/gpg-agent.c:2790
#, 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:2771
++#: agent/gpg-agent.c:2795
#, 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:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, 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:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppet\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
@@@ -739,8 -572,6 +734,8 @@@ msgstr "
"Syntaks: gpg-preset-passphrase [tilvalg] KEYGRIP\n"
"Adgangskode for mellemlagervedligeholdelse\n"
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -748,9 -579,6 +743,9 @@@ msgstr "
"@Kommandoer:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -807,8 -627,6 +802,8 @@@ msgstr "afbrudt\n
msgid "error while asking for the passphrase: %s\n"
msgstr "fejl ved oprettelse af adgangsfrasen: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -1007,8 -790,6 +1002,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, c-format
msgid "error forking process: %s\n"
msgstr "fejl ved forgrening af proces: %s\n"
@@@ -1464,7 -1147,6 +1459,7 @@@ msgstr "tilvalg »%.50s« er tvetydigt\
msgid "command \"%.50s\" is ambiguous\n"
msgstr "kommando »%.50s« er tvetydig\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
msgid "out of core\n"
msgstr "uden for kerne\n"
@@@ -1527,8 -1198,6 +1522,8 @@@ msgstr "lås »%s« er ikke udført: %s
msgid "waiting for lock %s...\n"
msgstr "venter på lås %s ...\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s er for gammel (kræver %s, har %s)\n"
@@@ -1712,8 -1344,6 +1707,8 @@@ msgstr "OpenPGP-kort er ikke tilgængel
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP-kortnr. %s detekteret\n"
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
msgid "can't do this in batch mode\n"
msgstr "kan ikke udføre dette i jobtilstand\n"
@@@ -1725,10 -1353,6 +1720,10 @@@ msgstr "Denne kommando er kun tilgænge
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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Dit valg? "
@@@ -1785,17 -1396,11 +1780,17 @@@ 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:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, 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:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
@@@ -1846,7 -1440,6 +1841,7 @@@ msgstr "nøglehandling er ikke mulig: %
msgid "not an OpenPGP card"
msgstr "ikke et OpenPGP-kort"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, c-format
msgid "error getting current key info: %s\n"
msgstr "fejl ved indhentelse af aktuel nøgleinformation: %s\n"
@@@ -1887,13 -1474,10 +1882,13 @@@ msgstr "Hvilken nøglestørrelse ønske
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr "Kortet vil nu blive omkonfigureret til at oprette en nøgle på %u bit\n"
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: 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:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 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"
@@@ -1954,9 -1528,6 +1949,9 @@@ msgstr " (2) Krypteringsnøgle\n
msgid " (3) Authentication key\n"
msgstr " (3) Godkendelsesnøgle\n"
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Ugyldigt valg.\n"
@@@ -2090,22 -1631,14 +2085,22 @@@ msgstr "--output virker ikke for denne
msgid "can't open '%s'\n"
msgstr "kan ikke åbne »%s«\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "fejl ved læsning af nøgleblok: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
#| msgid "key \"%s\" not found: %s\n"
msgid "key \"%s\" not found\n"
@@@ -2201,8 -1716,6 +2196,8 @@@ msgstr "
"ADVARSEL: Tvang for symmetrisk chiffer %s (%d) overtræder modtagerens "
"præferencer\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, 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"
@@@ -2234,7 -1743,6 +2229,7 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s krypteret for: »%s«\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2356,26 -1840,20 +2351,26 @@@ msgstr "%s: udelod: %s\n
msgid "writing to '%s'\n"
msgstr "skriver til »%s«\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "nøgle %s: nøglemateriale på kort - udeladt\n"
- #: g10/export.c:1904
++#: g10/export.c:1909
msgid "exporting secret keys not allowed\n"
msgstr "eksport af hemmelige nøgler er ikke tilladt\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "ADVARSEL: intet blev eksporteret\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2385,14 -1862,11 +2380,14 @@@ msgstr "fejl ved oprettelse af »%s«:
msgid "[User ID not found]"
msgstr "[Bruger-id blev ikke fundet]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
msgstr "manglende parameter for indstilling »%.50s«\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2403,61 -1876,50 +2398,61 @@@
msgid "error looking up: %s\n"
msgstr "fejl ved lukning af %s: %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "fejl ved oprettelse af nøglering »%s«: %s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, fuzzy, c-format
#| msgid "automatically retrieved `%s' via %s\n"
msgid "automatically retrieved '%s' via %s\n"
msgstr "hentede automatisk »%s« via %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, fuzzy, c-format
#| msgid "error retrieving `%s' via %s: %s\n"
msgid "error retrieving '%s' via %s: %s\n"
msgstr "fejl ved indhentelse af »%s« via %s: %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
msgid "No fingerprint"
msgstr "Ingen fingeraftryk"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, 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/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "valid values for option '%s':\n"
@@@ -2659,7 -2075,6 +2654,7 @@@ msgstr "brug kanonisk teksttilstand
msgid "|FILE|write output to FILE"
msgstr "|FILE|skriv resultat til FIL"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "lav ingen ændringer"
@@@ -3065,7 -2407,6 +3060,7 @@@ msgstr "%s:%d: ugyldig liste for auto-k
msgid "invalid auto-key-locate list\n"
msgstr "ugyldig liste for auto-key-locate\n"
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "ADVARSEL: program kan oprette en kernefil!\n"
@@@ -3084,7 -2422,6 +3079,7 @@@ msgstr "%s ikke tilladt med %s!\n
msgid "%s makes no sense with %s!\n"
msgstr "%s er meningsløs sammen med %s!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr "ADVARSEL: kører med forfalsket systemtid: "
@@@ -3093,7 -2429,6 +3088,7 @@@
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:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt chifferalgoritme er ugyldig\n"
@@@ -3156,8 -2477,6 +3151,8 @@@ msgstr "ugyldige præferencer for perso
msgid "%s does not yet work with %s\n"
msgstr "%s virker endnu ikke med %s\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 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"
@@@ -3291,7 -2584,6 +3286,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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|skriv statusinformation til denne FD"
@@@ -4660,7 -3678,6 +4655,7 @@@ msgstr "Er du sikker på, at du stadig
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Du må ikke tilføje et billed-id til en nøgle i PGP2-stil.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr "Sådant et bruger-id findes allerede på denne nøgle!\n"
@@@ -4965,55 -3921,43 +4960,55 @@@ msgstr "for mange sammendragpræference
msgid "too many compression preferences\n"
msgstr "for mange komprimeringspræferencer\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, fuzzy, c-format
#| msgid "invalid item `%s' in preference string\n"
msgid "invalid item '%s' in preference string\n"
msgstr "ugyldigt punkt »%s« i præferencestreng\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "skriver direkte underskrift\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "skriver egenunderskrift\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "skriver underskrift for nøglebinding\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "nøglestørrelse er ugyldig; bruger %u bit\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "nøglestørrelse afrundet op til %u bit\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"ADVARSEL: Nogle OpenPGP-programmer kan ikke håndtere en DS-nøgle med denne\n"
"sammendragsstørrelse\n"
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
msgid "Sign"
msgstr "Underskriv"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr "Certificer"
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
msgid "Encrypt"
msgstr "Krypter"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr "Godkend"
@@@ -5027,108 -3971,87 +5022,108 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr "UuKkGfAa"
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Mulige handligner for en %s-nøgle: "
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr "Aktuelt tilladte handlinger: "
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Skift evnen til at underskrive\n"
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Skift evnen til at kryptere\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Skift evnen til at godkende\n"
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Afsluttet\n"
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA og RSA (standard)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA og Elgamal\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (kun underskriv)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (kun underskriv)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (kun krypter)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (kun krypter)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (angiv dine egne evner)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (angiv dine egne evner)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, fuzzy, c-format
#| msgid " (%d) DSA and Elgamal\n"
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA og Elgamal\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (kun underskriv)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, fuzzy, c-format
#| msgid " (%d) DSA (set your own capabilities)\n"
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) DSA (angiv dine egne evner)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (kun krypter)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, fuzzy, c-format
#| msgid " (%d) Existing key\n"
msgid " (%d) Existing key\n"
@@@ -5137,51 -4060,41 +5132,51 @@@ msgstr " (%d) Eksisterende nøgle\n
# key grip
# chiefly ( US ) See also grip the person in charge of moving and setting up camera
# tracks and scenery in a film or television studio
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
msgid "Enter the keygrip: "
msgstr "Indtst nøglegrebet: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "Ikke et gyldigt nøglegreb (forventer 40 hex cifre)\n"
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
msgid "No key with this keygrip\n"
msgstr "Ingen nøgle med dette nøglegreb\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "afrundet op til %u bit\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s nøgler kan være mellem %u og %u bit lange.\n"
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Hvilken nøglestørrelse ønsker du for undernøglen? (%u) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Hvilken nøglestørrelse ønsker du? (%u) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Ønsket nøglestørrelse er %u bit\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5197,7 -4110,6 +5192,7 @@@ msgstr "
" <n>m = nøgle udløber om n måneder\n"
" <n>y = nøgle udløber om n år\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5213,38 -4125,30 +5208,38 @@@ msgstr "
" <n>m = underskriften udløber om n måneder\n"
" <n>y = underskriften udløber om n år\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "Nøgle er gyldig for? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Underskrift er gyldig for? (%s) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "ugyldig værdi\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
msgid "Key does not expire at all\n"
msgstr "Nøglen udløber aldrig\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
msgid "Signature does not expire at all\n"
msgstr "Underskriften udløber aldrig\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, c-format
msgid "Key expires at %s\n"
msgstr "Nøglen udløber den %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, c-format
msgid "Signature expires at %s\n"
msgstr "Underskriften udløber den %s\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5252,11 -4156,9 +5247,11 @@@ msgstr "
"Dit system kan ikke vise datoer efter 2038.\n"
"Det vil dog blive korrekt håndteret op til 2106.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
msgid "Is this correct? (y/N) "
msgstr "Er dette korrekt? (j/N) "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5270,7 -4172,6 +5265,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5286,50 -4187,39 +5281,50 @@@ msgstr "
" »Heinrich Heine (digteren) <heinrichh at duesseldorf.de>«\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Fødselsnavn: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Ugyldige bogstaver i navn\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "Navn må ikke starte med et tal\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "Navn skal være mindst 5 bogstaver langt\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "E-post-adresse: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "Ikke en gyldig e-post-adresse\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Kommentar: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Ugyldigt tegn i kommentar\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Du bruger tegnsættet »%s«.\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5340,7 -4230,6 +5335,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Placer ikke e-post-adressen i fødselsnavnet eller kommentaren\n"
@@@ -5355,35 -4244,28 +5350,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ændr (N)avn, (K)ommentar, (E)-post eller afslut(Q)? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/afslut(Q)? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Ændr (N)avn, (K)ommentar, (E)-post eller afslut(Q)? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/afslut(Q)? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Ret venligst fejlen først\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5395,13 -4277,10 +5390,13 @@@ msgstr "
"under oprettelse af primtallet; dette giver det vilkårlig\n"
"taloprettelsesprogram en bedre mulighed for at opnå nok entropi.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nøgleoprettelse mislykkedes: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5409,71 -4288,58 +5404,71 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "nøgle findes allerede\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
#, fuzzy
#| msgid "Use this key anyway? (y/N) "
msgid "Create anyway? (y/N) "
msgstr "Brug denne nøgle alligevel? (j/N) "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "opretter ny nøgle\n"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Nøgleoprettelse annulleret.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, fuzzy, c-format
#| msgid "can't create backup file `%s': %s\n"
msgid "can't create backup file '%s': %s\n"
msgstr "kan ikke oprette sikkerhedskopifil »%s«: %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "BEMÆRK: sikkerhedskopi af kortnøgle gemt på »%s«\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "skriver offentlig nøgle til »%s«\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ingen skrivbar offentlig nøglering fundet: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "fejl ved skrivning af offentlig nøglering »%s«: %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "offentlig og hemmelig nøgle oprettet og underskrevet.\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
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"
@@@ -5481,7 -4347,6 +5476,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:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5489,7 -4354,6 +5484,7 @@@ msgstr "
"nøgle er blevet oprettet %lu sekund i fremtiden (tidsforskydning eller "
"urproblem)\n"
- #: g10/keygen.c:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5497,22 -4361,18 +5492,22 @@@ msgstr "
"nøgle er blevet oprettet %lu sekunder i fremtiden (tidsforskydning eller "
"urproblem)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
#, 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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
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:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
msgid "Really create? (y/N) "
msgstr "Vil du virkelig oprette? (j/N) "
@@@ -6269,23 -4983,18 +6264,23 @@@ msgstr "Er dette billede korrekt (j/N/a
msgid "unable to display photo ID!\n"
msgstr "kan ikke vise billed-id!\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Ingen årsag angivet"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "Nøglen er blevet afløst"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "Nøglen er blevet kompromitteret"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "Nøglen bruges ikke længere"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "Bruger-id er ikke længere gyldigt"
@@@ -6364,7 -5060,6 +6359,7 @@@ msgstr "
"Minimumstroværdighedsniveau for denne nøgle er: %s\n"
"\n"
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Dit valg? "
@@@ -6519,48 -5186,39 +6514,48 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Det er ikke sikkert at signaturen tilhører ejeren.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: udelod: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: udelod: offentlig nøgle er slået fra\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: udelod: offentlig nøgle er allerede til stede\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "kan ikke forbinde til »%s«: %s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but no valid default keys given\n"
msgstr "linje %d: ugyldig algoritme\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but option '%s' not given\n"
msgstr "linje %d: ugyldig algoritme\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Du angav ikke et bruger-id. (du kan bruge »-r«)\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr "Aktuelle modtagere:\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6568,37 -5226,29 +6563,37 @@@ msgstr "
"\n"
"Indtast bruger-id'et. Slut med en tom linje: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Ingen sådan bruger-id.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "udeladt: offentlig nøgle er allerede valgt som standardmodtager\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "Offentlig nøgle er slået fra.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "udelod: offentlig nøgle er allerede angivet\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "ukendt standardmodtager »%s«\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "ingen gyldige adresser\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Bemærk: nøgle %s har ingen %s-funktion\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Bemærk: nøgle %s har ingen præference for %s\n"
@@@ -6704,7 -5332,6 +6699,7 @@@ msgstr "Hemmelig nøgle er tilgængelig
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Opret et designet tilbagekaldscertifikat for denne nøgle? (j/N) "
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "ASCII-pansret resultat er tvunget.\n"
@@@ -6722,20 -5346,17 +6717,20 @@@ msgstr "Tilbagekaldscertifikat oprettet
msgid "no revocation keys found for \"%s\"\n"
msgstr "ingen tilbagekaldsnøgler fundet for »%s«\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Opret et tilbagekaldscertifikat for denne nøgle? (j/N) "
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6744,20 -5365,17 +6739,20 @@@
"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:577
++#: g10/revoke.c:590
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Tilbagekaldscertifikat oprettet.\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6766,22 -5384,18 +6761,22 @@@ msgstr "hemmelig nøgle »%s« blev ikk
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "fejl ved oprettelse af nøglering »%s«: %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Opret et tilbagekaldscertifikat for denne nøgle? (j/N) "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6800,33 -5414,26 +6795,33 @@@ msgstr "
"forsigtig: Dit udskrivningssystem kan gemme dataene og gøre dem\n"
"tilgængelige for andre!\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Vælg venligst årsagen for tilbagekaldet:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Afbryd"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Du vil sikkert vælge %d her)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Indtast en valgfri beskrivelse; afslut den med en tom linje:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Årsag for tilbagekald: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(Ingen beskrivelse angivet)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
msgid "Is this okay? (y/N) "
msgstr "Er dette okay? (j/N) "
@@@ -7243,10 -5776,6 +7238,10 @@@ msgstr "fejl ved oprettelse af midlerti
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
@@@ -7281,7 -5805,6 +7276,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "fejl ved åbning af »%s«: %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
@@@ -7605,19 -6079,15 +7600,19 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, 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:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7683,7 -6141,6 +7678,7 @@@ msgstr "bruger %s troværdighedsmodel\n
msgid "no need for a trustdb check\n"
msgstr "intet behov for kontrol af trustdb\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "næste kontrol af trustdb sker den %s\n"
@@@ -7714,7 -6166,6 +7709,7 @@@ msgstr "udfør venligst en --check-trus
msgid "checking the trustdb\n"
msgstr "kontrollerer trustdb\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
#| msgid "%lu keys processed so far\n"
msgid "%d key processed"
@@@ -7722,7 -6173,6 +7717,7 @@@ msgid_plural "%d keys processed
msgstr[0] " %lu-nøgler behandlet\n"
msgstr[1] " %lu-nøgler behandlet\n"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7730,16 -6180,13 +7725,16 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d nøgler behandlet (%d validiteter ryddet)\n"
msgstr[1] "%d nøgler behandlet (%d validiteter ryddet)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "ingen ultimativ troværdige nøgler fundet\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "offentlig nøgle for ultimativ troværdig nøgle %s blev ikke fundet\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7747,7 -6194,6 +7742,7 @@@ msgstr "
"dybde: %d gyldig: %3d underskrevet: %3d troværdighed: %d-, %dq, %dn, %dm, "
"%df, %du\n"
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "kan ikke opdatere trustdb-versionspost: skrivning mislykkedes: %s\n"
@@@ -8177,57 -6537,44 +8172,57 @@@ msgstr "||Indtast venligst din PIN på
msgid "|N|Initial New PIN"
msgstr "|N|Oprindelig ny PIN"
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr "kør i flerservertilstand (forgrund)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|angiv fejlsøgningsniveau til NIVEAU"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
msgid "|FILE|write a log to FILE"
msgstr "|FILE|skriv en log til FIL"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr "|N|forbind til læser på port N"
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NAME|brug NAVN som ct-API-driver"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NAME|brug NAVN som PC/SC-driver"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
msgid "do not use the internal CCID driver"
msgstr "brug ikke den interne CCID-driver"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr "|N|frakobl kortet efter N sekunder inaktivitet"
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr "brug ikke en læsers numeriske tastatur"
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
msgid "deny the use of admin card commands"
msgstr "nægt brugen af kommandoer for administratorkort"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Brug: gpgconf [tilvalg] (-h for hjælp)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
#, fuzzy
#| msgid ""
#| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8239,7 -6586,6 +8234,7 @@@ msgstr "
"Syntaks: scdaemon [tilvalg] kommando [parametre]]\n"
"Smartcard-dæmon for GnuPG\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
#, fuzzy
#| msgid ""
#| "please use the option `--daemon' to run the program in the background\n"
@@@ -8247,12 -6593,10 +8242,12 @@@ msgid "please use the option '--daemon
msgstr ""
"brug venligst tilvalget »--daemon« til at køre programmet i baggrunden\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr "håndtering for fd %d startet\n"
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "håndtering for fd %d termineret\n"
@@@ -8964,7 -7155,6 +8959,7 @@@ msgstr "|FILE|tilføj nøglering til n�
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|USER-ID|brug BRUGER-ID som hemmelig standardnøgle"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|brug denne nøgleserver til at slå nøgler op"
@@@ -9028,19 -7208,16 +9023,19 @@@ msgstr "%s:%u: udelader denne linje\n
msgid "could not parse keyserver\n"
msgstr "kunne ikke fortolke nøgleserver\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, 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:1725
++#: sm/gpgsm.c:1726
#, 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:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr "ugyldig kommando (der er ingen implict kommando)\n"
@@@ -10081,126 -8068,98 +10076,126 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
#, 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:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "send en kommando til dirmngr'en"
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr "|FILE|skriv servertilstandslogge til FIL"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "Afslut uden at gemme? (j/N) "
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "tillad PKA-opslag (DNS-forespørgsler)"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
#, 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:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 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:216
++#: dirmngr/dirmngr.c:219
#, fuzzy
#| msgid "|URL|use keyserver at URL"
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|brug nøgleserver på adressen"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10213,13 -8172,11 +10208,13 @@@ msgstr "
"@\n"
"(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
#, 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:394
++#: dirmngr/dirmngr.c:402
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10231,88 -8188,71 +10226,88 @@@ msgstr "
"Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
"Hemmelig nøglehåndtering for GnuPG\n"
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, 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:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "brug: gpgsm [tilvalg] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
#, 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:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, 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:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, 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:1626
++#: dirmngr/dirmngr.c:1639
#, 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:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "ugyldig fingeraftryk"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, 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:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "ikke tvunget"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10797,86 -8646,70 +10792,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, 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:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, 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:1333
++#: dirmngr/server.c:1427
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_cert_by_url failed: %s\n"
msgstr "select mislykkedes: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, 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:1483
++#: dirmngr/server.c:1577
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "start_cert_fetch failed: %s\n"
msgstr "select mislykkedes: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_next_cert failed: %s\n"
msgstr "select mislykkedes: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, 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:2603
++#: dirmngr/server.c:2709
#, 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:2624
++#: dirmngr/server.c:2730
#, 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:2632
++#: dirmngr/server.c:2738
#, 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:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10928,7 -8753,6 +10923,7 @@@ msgstr "certifikat er gyldigt\n
msgid "certificate should not have been used for CRL signing\n"
msgstr "certifikat burde ikke være brugt for underskrift\n"
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
msgid "quiet"
msgstr "stille"
@@@ -11030,281 -8834,216 +11025,281 @@@ 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr "Tilvalg der kontrollerer det diagnostiske resultat"
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr "Tilvalg der kontrollerer konfigurationen"
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr "Tilvalg nyttige for fejlsøgning"
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr "Tilvalg der kontrollerer sikkerheden"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|udløb SSH-nøgler efter N sekunder"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|angive maksimal livsforløb for PIN-mellemlager til N sekunder"
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|angive maksimal livsforløb for SSH-nøgle til N sekunder"
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr "Tilvalg der fremtvinger en adgangsfrasepolitik"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr "tillad ikke omgåelse af adgangsfrasepolitikken"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|angiv minimal krævet længde for nye adgangsfraser til N"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|kræv mindst N ikkealfanumeriske tegn for en ny adgangsfrase"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|FILE|kontroller nye adgangsfraser mod mønstre i FIL"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
msgid "|N|expire the passphrase after N days"
msgstr "|N|giv adgangsfrasen udløb efter N dage"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
msgid "do not allow the reuse of old passphrases"
msgstr "tillad ikke genbrug af gamle adgangsfraser"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
#, fuzzy
#| msgid "|N|set maximum PIN cache lifetime to N seconds"
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|angive maksimal livsforløb for PIN-mellemlager til N sekunder"
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAME|krypter også til bruger-id-NAVN"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|opsæt e-post-aliasser"
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr "Konfiguration for nøgleservere"
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
msgid "|URL|use keyserver at URL"
msgstr "|URL|brug nøgleserver på adressen"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr "tillad PKA-opslag (DNS-forespørgsler)"
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
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:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr "deaktiver al adgang til dirmngr"
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAME|brug kodnings-NAVN for PKCS#12-adgangsfraser"
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr "kontroller ikke CRL'er for rodcertifikater"
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr "Tilvalg der kontrollerer formatet for resultatet"
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr "Tilvalg der kontrollerer interaktiviteten og tvang"
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
#, fuzzy
#| msgid "Options controlling the security"
msgid "Options controlling the use of Tor"
msgstr "Tilvalg der kontrollerer sikkerheden"
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr "Konfiguration for HTTP-servere"
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr "brug systemets HTTP-proxyopsætning"
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr "Konfiguraiton af LDAP-servere der skal bruges"
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr "LDAP-serverliste"
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr "Konfiguration for OCSP"
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
msgid "Network"
msgstr ""
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
#| msgid "Bad Passphrase"
msgid "Passphrase Entry"
msgstr "Ugyldig adgangsfrase"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
#, fuzzy
#| msgid "Component not found"
msgid "Component not suitable for launching"
msgstr "Komponent blev ikke fundet"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr "Ekstern verifikation af komponent %s mislykkedes"
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr "Bemærk at gruppespecifikationer ignoreres\n"
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, 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:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error parsing '%s'\n"
msgstr "fejl i »%s«: %s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr "vis alle komponenter"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr "kontroller alle programmer"
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr "|COMPONENT|vis indstillinger"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr "|COMPONENT|ændr indstillinger"
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr "|COMPONENT|kontroller indstillinger"
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr "anvend globale standardværdier"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
#, fuzzy
#| msgid "|FILE|take policy information from FILE"
msgid "|FILE|update configuration files using FILE"
msgstr "|FILE|tag politikinformation fra FIL"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
#, fuzzy
#| msgid "get the configuration directories for gpgconf"
msgid "get the configuration directories for @GPGCONF@"
msgstr "hent konfigurationsmapperne for gpgconf"
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
msgid "list global configuration file"
msgstr "vis global konfigurationsfil"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
msgid "check global configuration file"
msgstr "kontroller global konfigurationsfil"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "opdater troværdighedsdatabasen"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
#, fuzzy
#| msgid "list all components"
msgid "reload all or a given component"
msgstr "vis alle komponenter"
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
#, fuzzy
#| msgid "list all components"
msgid "launch a given component"
msgstr "vis alle komponenter"
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
#, fuzzy
#| msgid "list all components"
msgid "kill a given component"
msgstr "vis alle komponenter"
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "brug som uddatafil"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr "aktiver ændringer ved kørselstid, hvis muligt"
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
#, 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:131
++#: tools/gpgconf.c:139
#, fuzzy
#| msgid ""
#| "Syntax: gpgconf [options]\n"
@@@ -11316,15 -9055,12 +11311,15 @@@ msgstr "
"Syntaks: gpgconf [tilvalg]\n"
"Håndter konfigurationsindstillinger for værktøjer i GnuPG-systemet\n"
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr "Kræver en kompomentparameter"
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
msgid "Component not found"
msgstr "Komponent blev ikke fundet"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
msgid "No argument allowed"
msgstr "Ingen parameter tilladt"
diff --cc po/de.po
index fa459f3,4351d32..1694b62
--- 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-11-20 12:04+0100\n"
- "PO-Revision-Date: 2017-11-02 17:36+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
+ "PO-Revision-Date: 2017-12-19 12:28+0100\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@@ -158,25 -129,10 +158,25 @@@ msgstr "Falsche Passphrase!
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, c-format
msgid "can't open '%s': %s\n"
msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@@ -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:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -396,134 -311,95 +396,134 @@@ msgstr "
"@Optionen:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr "Im Daemon Modus ausführen"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr "Im Server Modus ausführen"
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
msgid "run in supervised mode"
msgstr "Im \"Supervised\" Modus ausführen"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "Detaillierte Informationen"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "Reduzierte Informationen"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr "Ausgabe für /bin/sh"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr "Ausgabe für /bin/csh"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr "Im Vordergrund laufen lassen"
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "Logausgaben in eine Datei umlenken"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|Benutze PGM as PIN-Entry"
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|Benutze PGM als SCdaemon"
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
msgid "do not use the SCdaemon"
msgstr "Den SCdaemon-basierten Kartenzugriff nicht nutzen"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|Einige Kommandos über NAME annehmen"
- #: agent/gpg-agent.c:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr "Ignoriere Anfragen, das TTY zu wechseln"
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr "Ignoriere Anfragen, das X-Display zu wechseln"
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|Lasse PINs im Cache nach N Sekunden verfallen"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr "Benutze PINs im Cache nicht beim Signieren"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
msgid "disallow the use of an external password cache"
msgstr "Verbiete die Verwendung eines externen Passwordmanagers"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr "Verbiete Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
msgid "allow presetting passphrase"
msgstr "Erlaube ein \"preset\" von Passphrases"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr "Aufrufer darf das Pinentry nicht ersetzen"
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr "Erlaube die Eingabe einer Passphrase über Emacs"
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
msgid "enable ssh support"
msgstr "SSH Unterstützung einschalten"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr "Verwende ALGO für SSH Fingerabdrücke"
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
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:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Gebrauch: @GPG_AGENT@ [Optionen] [Kommando [Argumente]]"
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -531,140 -407,99 +531,135 @@@ msgstr "
"Syntax: @GPG_AGENT@ [Optionen] [Befehl [Argumente]]\n"
"Verwaltung von geheimen Schlüsseln für @GNUPG@\n"
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "ungültige Debugebene `%s' angegeben\n"
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
- #: agent/gpg-agent.c:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "Optionendatei '%s': %s\n"
- #: agent/gpg-agent.c:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, c-format
msgid "reading options from '%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
- #: agent/gpg-agent.c:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Hinweis: `%s' wird nicht als Option betrachtet\n"
- #: agent/gpg-agent.c:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, c-format
msgid "can't create socket: %s\n"
msgstr "Socket kann nicht erzeugt werden: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "Der Name des Sockets `%s' ist zu lang\n"
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
msgid "error getting nonce for the socket\n"
msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, 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:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, 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:2241 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:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, c-format
msgid "listening on socket '%s'\n"
msgstr "Es wird auf Socket `%s' gehört\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
- #: agent/gpg-agent.c:2327
++#: agent/gpg-agent.c:2351
#, 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:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, 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:2686
++#: agent/gpg-agent.c:2710
#, 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:2691
++#: agent/gpg-agent.c:2715
#, 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:2766
++#: agent/gpg-agent.c:2790
#, 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:2771
++#: agent/gpg-agent.c:2795
#, 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:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s angehalten\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
@@@ -680,8 -513,6 +675,8 @@@ msgstr "
"Syntax: gpg-preset-passphrase [Optionen] KEYGRIP\n"
"Kennwortpuffer-Pflege\n"
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -689,9 -520,6 +684,9 @@@ msgstr "
"@Befehle:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -747,8 -567,6 +742,8 @@@ msgstr "Vom Benutzer abgebrochen\n
msgid "error while asking for the passphrase: %s\n"
msgstr "Fehler bei der Abfrage der Passphrase: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, c-format
msgid "error opening '%s': %s\n"
msgstr "Fehler beim Öffnen von `%s': %s\n"
@@@ -944,8 -727,6 +939,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, c-format
msgid "error forking process: %s\n"
msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
@@@ -1232,11 -950,9 +1227,11 @@@ msgstr "Hashverfahren für Attribute: %
msgid "Data decryption succeeded"
msgstr "Entschlüsselung der Daten erfolgreich"
+#: common/audit.c:910
msgid "Encryption algorithm supported"
- msgstr "Verschlüsselungsverfahren %d%s wird nicht unterstützt"
+ msgstr "Verschlüsselungsverfahren wird unterstützt"
+#: common/audit.c:993
msgid "Data verification succeeded"
msgstr "Prüfung der Signatur erfolgreich"
@@@ -1382,7 -1065,6 +1377,7 @@@ msgstr "Option \"%.50s\" ist mehrdeutig
msgid "command \"%.50s\" is ambiguous\n"
msgstr "Befehl \"%.50s\" ist mehrdeutig\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
msgid "out of core\n"
msgstr "Nicht genügend Speicher\n"
@@@ -1440,8 -1111,6 +1435,8 @@@ msgstr "Dateisperre %s konnte nicht ein
msgid "waiting for lock %s...\n"
msgstr "Warten auf die Freigabe der Dateisperre `%s' ...\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, 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"
@@@ -1614,8 -1246,6 +1609,8 @@@ msgstr "OpenPGP Karte ist nicht vorhand
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP Karte Nr. %s erkannt\n"
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
msgid "can't do this in batch mode\n"
msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
@@@ -1627,10 -1255,6 +1622,10 @@@ msgstr "Dieser Befehl ist nur für Kart
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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Ihre Auswahl? "
@@@ -1688,16 -1299,10 +1683,16 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "URL um den öffentlichen Schlüssel zu holen: "
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, c-format
msgid "error reading '%s': %s\n"
msgstr "Fehler beim Lesen von `%s': %s\n"
- #: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "Fehler beim Schreiben von %s: %s\n"
@@@ -1747,7 -1341,6 +1742,7 @@@ msgstr "Schlüsseloperation nicht mögl
msgid "not an OpenPGP card"
msgstr "Keine gültige OpenPGP-Karte"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, c-format
msgid "error getting current key info: %s\n"
msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
@@@ -1790,13 -1377,10 +1785,13 @@@ msgstr "
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr "Die Karte wird nun rekonfiguriert für einen Schlüssel des Typs: %s\n"
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "aufgerundet auf %u Bit\n"
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 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"
@@@ -1853,9 -1427,6 +1848,9 @@@ msgstr " (2) Verschlüsselungs-Schlü
msgid " (3) Authentication key\n"
msgstr " (3) Authentisierungs-Schlüssel\n"
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Ungültige Auswahl.\n"
@@@ -1983,22 -1524,14 +1978,22 @@@ msgstr "--output funktioniert nicht be
msgid "can't open '%s'\n"
msgstr "'%s' kann nicht geöffnet werden\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "Fehler beim Lesen des Schlüsselblocks: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, c-format
msgid "key \"%s\" not found\n"
msgstr "Schlüssel \"%s\" nicht gefunden\n"
@@@ -2092,8 -1607,6 +2087,8 @@@ msgstr "
"WARNUNG: Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren "
"%s (%d) verletzt die Empfängervoreinstellungen\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, c-format
msgid "cipher algorithm '%s' may not be used in %s mode\n"
msgstr ""
@@@ -2126,7 -1635,6 +2121,7 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s verschlüsselt für: %s\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, c-format
msgid "option '%s' may not be used in %s mode\n"
msgstr "Die Benutzung der Option \"%s\" ist im %s-Modus nicht erlaubt.\n"
@@@ -2241,26 -1725,20 +2236,26 @@@ msgstr " - übersprungen
msgid "writing to '%s'\n"
msgstr "Schreiben nach '%s'\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, 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:1904
++#: g10/export.c:1909
msgid "exporting secret keys not allowed\n"
msgstr "Exportieren geheimer Schlüssel ist nicht erlaubt\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "WARNUNG: Nichts exportiert\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2269,13 -1746,10 +2264,13 @@@
msgid "[User ID not found]"
msgstr "[User-ID nicht gefunden]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(Prüfe das Argument der Option '%s')\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2286,59 -1759,48 +2281,59 @@@
msgid "error looking up: %s\n"
msgstr "Fehler beim Nachschlagen von: %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, c-format
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "WARNUNG: %s ist %d mal im Schlüsselbund vorhanden\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "`%s' automatisch via %s geholt\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "Fehler beim automatischen holen von `%s' über `%s': %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
msgid "No fingerprint"
msgstr "Kein Fingerabdruck vorhanden"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "Geheimer Schlüssel \"%s\" nicht gefunden: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, c-format
msgid "Warning: not using '%s' as default key: %s\n"
msgstr ""
"WARNUNG: \"%s\" wird nicht als voreingestellter geheimer Schlüssel benutzt: "
"%s\n"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, c-format
msgid "using \"%s\" as default secret key for signing\n"
msgstr "\"%s\" wird als voreingestellter geheimer Signaturschlüssel benutzt\n"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr "Alle für '%s' angegebenen Werte wurden ignoriert\n"
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, 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/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, c-format
msgid "valid values for option '%s':\n"
msgstr "Gültige Argumente für Option '%s':\n"
@@@ -2527,7 -1943,6 +2522,7 @@@ msgstr "Textmodus benutzen
msgid "|FILE|write output to FILE"
msgstr "|DATEI|Ausgabe auf DATEI schreiben"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "Keine wirklichen Änderungen durchführen"
@@@ -2899,7 -2241,6 +2894,7 @@@ msgstr "%s:%d: ungültige \"auto-key-lo
msgid "invalid auto-key-locate list\n"
msgstr "ungültige \"auto-key-locate\"-Liste\n"
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
@@@ -2918,7 -2256,6 +2913,7 @@@ msgstr "%s zusammen mit %s ist nicht er
msgid "%s makes no sense with %s!\n"
msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
@@@ -2927,7 -2263,6 +2922,7 @@@
msgid "will not run with insecure memory due to %s\n"
msgstr "Startet nicht mit unsicherem Speicher, wegen Option %s\n"
- #: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
@@@ -2988,8 -2309,6 +2983,8 @@@ msgstr "ungültige private Komprimierun
msgid "%s does not yet work with %s\n"
msgstr "%s arbeitet noch nicht mit %s zusammen\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 sm/sign.c:478 sm/verify.c:473
#, c-format
msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "Die Benutzung der Hashmethode %s ist im %s Modus nicht erlaubt.\n"
@@@ -3123,7 -2416,6 +3118,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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
@@@ -4446,7 -3464,6 +4441,7 @@@ msgstr "Wollen Sie ihn immer noch hinzu
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Sie können einem PGP2-artigen Schlüssel keine Foto-ID hinzufügen.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
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"
@@@ -4744,54 -3700,42 +4739,54 @@@ msgstr "zu viele Hashvoreinstellungen\n
msgid "too many compression preferences\n"
msgstr "zu viele Komprimierungsvoreinstellungen\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "Ungültiges Feld `%s' in der Voreinstellungszeichenkette\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "Die Eigenbeglaubigung wird geschrieben\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "Schreiben der \"key-binding\" Signatur\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Ungültige Schlüssellänge; %u Bit werden verwendet\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"WARNUNG: Einige OpenPGP-Programme können einen DSA-Schlüssel dieser "
"Digestlänge nicht verwenden\n"
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
msgid "Sign"
msgstr "Signieren"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr "Zertif."
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
msgid "Encrypt"
msgstr "Verschl."
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr "Authentisierung"
@@@ -4805,150 -3749,119 +4800,150 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr "SsVvAaQq"
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Mögliche Vorgänge eines %s-Schlüssels: "
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr "Derzeit erlaubte Vorgänge: "
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Umschalten der Signaturnutzbarkeit\n"
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Umschalten der Verschlüsselungsnutzbarkeit\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Umschalten der Authentisierungsnutzbarkeit\n"
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Beenden\n"
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Bitte wählen Sie, welche Art von Schlüssel Sie möchten:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA und RSA (voreingestellt)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA und Elgamal\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (nur signieren/beglaubigen)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (nur signieren/beglaubigen)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (nur verschlüsseln)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (nur verschlüsseln)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (Nutzung selber einstellbar)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (Nutzung selber einstellbar)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) ECC und ECC\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, c-format
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) ECC (nur signieren)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) ECC (Nutzung selber einstellbar)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, c-format
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) ECC (nur verschlüsseln)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) Vorhandener Schlüssel\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
msgid "Enter the keygrip: "
msgstr "Geben Sie den \"Keygrip\" ein: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "Kein gültiger \"Keygrip\" (40 Hex-Ziffern werden erwartet)\n"
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
msgid "No key with this keygrip\n"
msgstr "Kein Schlüssel mit diesem \"Keygrip\"\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, c-format
msgid "rounded to %u bits\n"
msgstr "gerundet auf %u Bit\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s-Schlüssel können zwischen %u und %u Bit lang sein.\n"
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Welche Schlüssellänge wünschen Sie für den Unterschlüssel? (%u) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Welche Schlüssellänge wünschen Sie? (%u) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
msgid "Please select which elliptic curve you want:\n"
msgstr "Bitte wählen Sie, welche elliptische Kurve Sie möchten:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -4964,7 -3877,6 +4959,7 @@@ msgstr "
" <n>m = Schlüssel verfällt nach n Monaten\n"
" <n>y = Schlüssel verfällt nach n Jahren\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -4980,38 -3892,30 +4975,38 @@@ msgstr "
" <n>m = Schlüssel verfällt nach n Monaten\n"
" <n>y = Schlüssel verfällt nach n Jahren\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "Wie lange bleibt der Schlüssel gültig? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Wie lange bleibt die Beglaubigung gültig? (%s) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "Ungültiger Wert.\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
msgid "Key does not expire at all\n"
msgstr "Schlüssel verfällt nie\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
msgid "Signature does not expire at all\n"
msgstr "Signature verfällt nie\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, c-format
msgid "Key expires at %s\n"
msgstr "Key verfällt am %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, c-format
msgid "Signature expires at %s\n"
msgstr "Signatur verfällt am %s\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5019,11 -3923,9 +5014,11 @@@ msgstr "
"Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
"Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
msgid "Is this correct? (y/N) "
msgstr "Ist dies richtig? (j/N) "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5037,7 -3939,6 +5032,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5053,49 -3954,38 +5048,49 @@@ msgstr "
" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Ihr Name (\"Vorname Nachname\"): "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Ungültiges Zeichen im Namen\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr "Die Zeichen '%s' und '%s' dürfen in einem Namen nicht vorkommen\n"
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "Email-Adresse: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "Diese Email-Adresse ist ungültig\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Kommentar: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Ungültiges Zeichen im Kommentar.\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "Sie benutzen den Zeichensatz `%s'\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5106,7 -3996,6 +5101,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
@@@ -5121,31 -4010,24 +5116,31 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnKkEeFfAa"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (A)bbrechen? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(A)bbrechen? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Ändern: (N)ame, (E)-Mail oder (A)bbrechen? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Ändern: (N)ame, (E)-Mail oder (F)ertig/(A)bbrechen? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
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"
@@@ -5156,13 -4038,10 +5151,13 @@@ msgstr "
"unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
"tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5173,62 -4052,49 +5168,62 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr "Fortsetzen? (J/n) "
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Ein Schlüssel für \"%s\" existiert bereits\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
msgid "Create anyway? (y/N) "
msgstr "Trotzdem erzeugen? (j/N) "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
msgid "creating anyway\n"
msgstr "wird trotzdem erzeugt\n"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr "Hinweis: \"%s %s\" ruft den erweiterten Dialog auf.\n"
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Schlüsselerzeugung abgebrochen.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "Hinweis: Sicherung des Kartenschlüssels wurde auf `%s' gespeichert\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, c-format
msgid "writing public key to '%s'\n"
msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
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"
@@@ -5237,7 -4103,6 +5232,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:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5245,7 -4110,6 +5240,7 @@@ msgstr "
"Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
"stimmen nicht überein)\n"
- #: g10/keygen.c:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5253,19 -4117,15 +5248,19 @@@ msgstr "
"Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
"Uhren stimmen nicht überein)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
msgid "Secret parts of primary key are not available.\n"
msgstr "Geheime Teile des Hauptschlüssels sind nicht vorhanden.\n"
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
msgid "Really create? (y/N) "
msgstr "Wirklich erzeugen? (j/N) "
@@@ -6009,23 -4723,18 +6004,23 @@@ msgstr "Ist dieses Bild richtig? (j/N)
msgid "unable to display photo ID!\n"
msgstr "Die Foto-ID kann nicht angezeigt werden!\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Kein Grund angegeben"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "Schlüssel ist überholt"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "Hinweis: Dieser Schlüssel ist nicht mehr sicher"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "Schlüssel wird nicht mehr benutzt"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "User-ID ist nicht mehr gültig"
@@@ -6101,7 -4797,6 +6096,7 @@@ msgid "
"\n"
msgstr "Die minimale Trust-Ebene für diesen Schlüssel beträgt: %s\n"
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Ihre Auswahl? "
@@@ -6253,46 -4920,37 +6248,46 @@@ msgstr "
" Es ist nicht sicher, daß die Signatur wirklich dem vorgeblichen "
"Besitzer gehört.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: übersprungen: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, c-format
msgid "can't encrypt to '%s'\n"
msgstr "Verschlüsseln an '%s' ist nicht möglich\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "Option '%s' ohne gültige Standardschlüssel angegeben\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "Option '%s' ohne Verwendung der Option '%s' angegeben\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr ""
"Sie haben keine User-ID angegeben (Sie können die Option \"-r\" verwenden).\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr "Derzeitige Empfänger:\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6300,38 -4958,30 +6295,38 @@@ msgstr "
"\n"
"Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Keine solche User-ID vorhanden.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr ""
"übersprungen: öffentlicher Schlüssel bereits als Standardempfänger gesetzt\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "Öffentlicher Schlüssel ist abgeschaltet.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "übersprungen: öffentlicher Schlüssel bereits gesetzt\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "Unbekannter voreingestellter Empfänger \"%s\"\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "Keine gültigen Adressaten\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Hinweis: Schlüssel %s besitzt nicht die %s Eigenschaft\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Hinweis: Schlüssel %s hat keine Einstellung für %s\n"
@@@ -6434,7 -5062,6 +6429,7 @@@ msgid "Create a designated revocation c
msgstr ""
"Ein vorgesehenes Widerrufszertifikat für diesen Schlüssel erzeugen? (j/N) "
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "Ausgabe mit ASCII Hülle erzwungen\n"
@@@ -6452,11 -5076,9 +6447,11 @@@ msgstr "Widerrufzertifikat erzeugt.\n
msgid "no revocation keys found for \"%s\"\n"
msgstr "keine Widerrufsschlüssel für \"%s\" gefunden\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Dies ist ein Widerrufszertifikat für den OpenPGP Schlüssel:"
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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"
@@@ -6467,7 -5089,6 +6462,7 @@@ msgstr "
"nicht möglich, ein einmal veröffentlichtes Widerrufszertifikat wieder\n"
"zurückzuziehen."
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6482,7 -5103,6 +6477,7 @@@ msgstr "
"mit angeben zu können. Weitere Informationen finden Sie im GnuPG\n"
"Handbuch unter der Beschreibung des gpg Kommandos \"--generate-revocation\"."
- #: g10/revoke.c:577
++#: g10/revoke.c:590
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"
@@@ -6493,12 -5113,10 +6488,12 @@@ msgstr "
"unten eingefügt. Vor dem Import dieses Widerrufszertifikats\n"
"entfernen Sie bitte diesen Doppelpunkt mittels eines Texteditors."
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, c-format
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Widerrufzertifikat wurde als '%s.rev' gespeichert.\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, c-format
msgid "secret key \"%s\" not found\n"
msgstr "Geheimer Schlüssel \"%s\" nicht gefunden\n"
@@@ -6506,22 -5124,18 +6501,22 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr "'%s' trifft auf mehrere geheime Schlüssel zu:\n"
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, c-format
msgid "error searching the keyring: %s\n"
msgstr "Fehler beim Suchen im Schlüsselbund: %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Ein Widerrufszertifikat für diesen Schlüssel erzeugen? (j/N) "
# translated by wk
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6541,34 -5155,27 +6536,34 @@@ msgstr "
"Drucksystem kann unter Umständen eine Kopie anderen Nutzern zugänglich\n"
"machen.\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Grund für den Widerruf:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Abbruch"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Wahrscheinlich möchten Sie hier %d auswählen)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr ""
"Geben Sie eine optionale Beschreibung ein. Beenden mit einer leeren Zeile:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Grund für Widerruf: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(Keine Beschreibung angegeben)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
msgid "Is this okay? (y/N) "
msgstr "Ist das OK? (j/N) "
@@@ -6976,10 -5509,6 +6971,10 @@@ msgstr "Fehler beim Erstellen einer tem
msgid "TOFU DB error"
msgstr "TOFU (Trust on First Use) database error"
+#: 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
++#: g10/tofu.c:3408
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "Fehler beim Lesen der TOFU Datenbank: %s\n"
@@@ -7010,7 -5534,6 +7005,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "Fehler beim Öffner der TOFU Datenbank '%s': %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "Fehler beim Schreiben der TOFU Datenbank: %s\n"
@@@ -7420,18 -5894,14 +7415,18 @@@ msgstr[1] "
" %s\n"
"um den Schlüssel als Fälschung zu markieren.\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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "Fehler beim Öffnen der TOFU Datenbank: %s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring '%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7500,7 -5958,6 +7495,7 @@@ msgstr "verwende Vertrauensmodell %s\n
msgid "no need for a trustdb check\n"
msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n"
@@@ -7528,7 -5980,6 +7523,7 @@@ msgstr "Bitte ein --check-trustdb durch
msgid "checking the trustdb\n"
msgstr "\"Trust-DB\" wird überprüft\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
@@@ -7536,23 -5987,19 +7531,23 @@@ msgstr[0] "%d Schlüssel bislang bearbe
msgstr[1] "%d Schlüssel bislang bearbeitet"
# translated by wk
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, c-format
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
msgstr[0] " (%d Validity Zähler gelöscht)\n"
msgstr[1] " (%d Validity Zähler gelöscht)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "keine ultimativ vertrauenswürdigen Schlüssel gefunden\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "öff. Schlüssel des ultimativ vertrauten Schlüssel %s nicht gefunden\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7560,7 -6007,6 +7555,7 @@@ msgstr "
"Tiefe: %d gültig: %3d signiert: %3d Vertrauen: %d-, %dq, %dn, %dm, %df, "
"%du\n"
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -7982,55 -6342,42 +7977,55 @@@ msgstr "||Bitte die PIN auf der Tastatu
msgid "|N|Initial New PIN"
msgstr "|N|Erstmalige neue PIN"
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr "Im Multiserver Modus ausführen"
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NAME|Die Debugstufe auf NAME setzen"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
msgid "|FILE|write a log to FILE"
msgstr "|DATEI|Schreibe Logs auf DATEI"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr "|N|Verbinde mit dem Leser auf Port N"
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NAME|Benutze NAME als CT-API Treiber"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NAME|Benutze NAME als PC/SC Treiber"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
msgid "do not use the internal CCID driver"
msgstr "Den internen CCID Treiber nicht benutzen"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr "|N|Schalte die Karte nach N Sekunden Inaktivität ab"
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr "Die Tastatur des Kartenlesers nicht benutzen"
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
msgid "deny the use of admin card commands"
msgstr "Verweigere die Benutzung von \"Admin\"-Befehlen"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr "Variable Längeneingabe für die Kartenlesertastatur benutzen"
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Gebrauch: @SCDAEMON@ [Optionen] (-h für Hilfe)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
@@@ -8038,18 -6385,15 +8033,18 @@@ msgstr "
"Syntax: @SCDAEMON@ [Optionen] [Befehl [Argumente]]\n"
"Smartcard Daemon für @GNUPG@\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
"Bitte die Option `--daemon' nutzen, um das Programm im Hintergund "
"auszuführen\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr "Handhabungsroutine für fd %d gestartet\n"
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "Handhabungsroutine für den fd %d beendet\n"
@@@ -8746,7 -6937,6 +8741,7 @@@ msgstr "|DATEI|DATEI als öffentlichen
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|USER-ID|USER-ID als voreingestellten Schlüssel benutzen"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|Schlüssel bei diesem Server nachschlagen"
@@@ -8800,17 -6980,14 +8795,17 @@@ msgstr "%s:%u: Zeile wird übersprungen
msgid "could not parse keyserver\n"
msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "Importiere allgemeine Zertifikate: %s\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "Signieren mit `%s' nicht möglich: %s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr "Ungültiger Befehl (Es gibt keinen implizierten Befehl)\n"
@@@ -9777,112 -7764,84 +9772,112 @@@ msgstr "Absoluter Dateiname erwartet\n
msgid "looking up '%s'\n"
msgstr "Auffinden von `%s'\n"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr "Den Inhalt des CRL Zwischenspeichers anzeigen"
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
msgid "|FILE|load CRL from FILE into cache"
msgstr "|DATEI|Lade die CRL aus der DATEI in den Zwischenspeicher"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|Hole eine CRL von dieser URL"
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr "Den Dirmngr herunterfahren"
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr "Den Zwischenspeicher löschen"
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
msgid "run without asking a user"
msgstr "Ausführung ohne Benutzernachfrage"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr "Laden von abgelaufenen CRLs erzwingen"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr "OCSP Anfragen erlauben"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr "Online Softwareversionstest erlauben"
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr "Sperre die Benutzung von HTTP"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr "Sperre die Benutzung von LDAP"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr "Übergehe HTTP CRL Distribution Points"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr "Übergehe LDAP CRL Distribution Points"
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr "Übergehe im Zertifikat enthaltene OCSP Service URLs"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|Leite alle HTTP Anfragen über URL"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HOST|Benutze HOST für LDAP Anfragen"
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "Keine Benutzung der Rückgriffshosts mit --ldap-proxy"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
msgid "|FILE|read LDAP server list from FILE"
msgstr "|DATEI|Lese die LDAP Serverliste aus DATEI"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
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:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 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:216
++#: dirmngr/dirmngr.c:219
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|Benutze den OCSP Responder mit dieser URL"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|OCSP Antwort ist durch FPR signiert"
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
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:229
++#: dirmngr/dirmngr.c:232
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:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr "Netzzugriff nur über Tor"
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9892,11 -7851,9 +9887,11 @@@ msgstr "
"(Im \"info\"-Handbuch findet sich eine vollständige Liste aller Kommandos "
"und Optionen)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Gebrauch: @DIRMNGR@ [Optionen]"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9904,79 -7861,62 +9899,79 @@@ msgstr "
"Syntax: @DIRMNGR@ [Optionen] [Kommando [Argumente]]\n"
"Keyserver, CRL und OCSP Zugriff für @GNUPG@\n"
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "Gültige Debugebenen sind: %s\n"
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, c-format
msgid "usage: %s [options] "
msgstr "Aufruf: %s [Optionen] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
msgid "colons are not allowed in the socket name\n"
msgstr "Doppelpunkte sind im Namen des Sockets nicht erlaubt\n"
- #: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n"
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "Verarbeitung der CRL von `%s' fehlgeschlagen: %s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: Zeile ist zu lang - übergangen\n"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: ungültiger Fingerabdruck erkannt\n"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: Lesefehler: %s\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, 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:1838
++#: dirmngr/dirmngr.c:1851
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:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr "SIGUSR2 empfangen - keine Aktion definiert\n"
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr "SIGTERM empfangen - wird heruntergefahren ...\n"
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "SIGTERM empfangen - immer noch %d Verbindungen aktiv\n"
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
msgid "shutdown forced\n"
msgstr "Herunterfahren wurde erzwungen\n"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr "SIGINT empfangen - wird sofort heruntergefahren\n"
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "Signal %d empfangen - keine Aktion definiert\n"
@@@ -10402,76 -8251,60 +10397,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:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assuan_inquire(%s) fehlgeschlagen: %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr "LDAP Server fehlt"
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr "Seriennummer fehlt in der Cert-ID"
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assuan_inquire fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fetch_cert_by_url() fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, c-format
msgid "error sending data: %s\n"
msgstr "Fehler beim Senden der Daten: %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "start_cert_fetch fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fetch_next_cert fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d überschritten\n"
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "Fehler beim Erzeugen der Kontrollstruktur: %s\n"
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "Fehler beim Bereitstellen eines Assuan Kontext: %s\n"
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "Fehler beim Initialisieren des Servers: %s\n"
- #: dirmngr/server.c:2632
++#: dirmngr/server.c:2738
#, 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:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan accept Problem: %s\n"
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuan Verarbeitung fehlgeschlagen: %s\n"
@@@ -10512,7 -8337,6 +10507,7 @@@ msgid "certificate should not have bee
msgstr ""
"Das Zertifikat hätte nicht zum Signieren einer CRL benutzt werden sollen\n"
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
msgid "quiet"
msgstr "Reduzierte Informationen"
@@@ -10603,259 -8407,194 +10598,259 @@@ 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr "Optionen zur Einstellung der Diagnoseausgaben"
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr "Optionen zur Einstellung der Konfiguration"
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr "Nützliche Optionen zur Fehlersuche"
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr "Optionen zur Einstellung der Sicherheit"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|lasse SSH Schlüssel im Cache nach N Sekunden verfallen"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
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:544
++#: tools/gpgconf-comp.c:545
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:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr "Optionen für eine Passphrase-Policy"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr "Einhaltung der Passphrase-Policy erzwingen"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|setze die kleinste erlaubte Länge von Passphrasen auf N"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|Verlange mindestens N Nicht-Buchstaben für eine neue Passphrase"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|DATEI|Prüfe neue Passphrases gegen die Regelen in DATEI"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
msgid "|N|expire the passphrase after N days"
msgstr "|N|Lasse die Passphrase nach N Tagen verfallen"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
msgid "do not allow the reuse of old passphrases"
msgstr "Verbiete die Wiedernutzung alter Passphrases."
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|Setze die Pinentry Zeitüberschreitung auf N Sekunden"
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAME|Auch an NAME verschlüsseln"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|Email Alias festlegen"
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr "Konfiguration der Schlüsselserver"
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
msgid "|URL|use keyserver at URL"
msgstr "Benutze Schlüsselserver unter der URL"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr "Erlaube PKA Zugriffe (DNS Anfragen)"
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
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:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr "Jeglichen Zugriff auf den Dirmngr verhindern"
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAME|Benutze die Kodierung NAME für PKCS#12 Passphrasen"
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr "CRL bei Wurzelzertifikaten nicht überprüfen"
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr "Optionen zum Einstellen der Ausgabeformate"
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr "Optionen zur Einstellung der Interaktivität und Geltendmachung"
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
msgstr "Optionen zur Benutzung von Tor"
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr "Konfiguration für HTTP Server"
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr "Benutze die HTTP Proxy Einstellung des Systems"
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr "Konfiguration der zu nutzenden LDAP-Server"
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr "Liste der LDAP Server"
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr "Konfiguration zu OCSP"
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr "OpenPGP"
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr "Geheime Schlüssel"
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr "Smartcard"
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr "S/MIME"
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
msgid "Network"
msgstr "Netz"
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
msgid "Passphrase Entry"
msgstr "Passphrase Eingabe"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
msgid "Component not suitable for launching"
msgstr "Komponente unterstützt kein direktes starten"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr "Die externe Überprüfung der Komponente %s war nicht erfolgreich"
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, c-format
msgid "error closing '%s'\n"
msgstr "Fehler beim Schließen von '%s'\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, c-format
msgid "error parsing '%s'\n"
msgstr "Fehler beim Hashen von '%s'\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr "Liste aller Komponenten"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr "Prüfe alle Programme"
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr "|KOMPONENTE|Zeige die Optionen an"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr "|KOMPONENTE|Ändere die Optionen"
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr "|KOMPONENTE|Prüfe die Optionen"
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr "Wende die gobalen Voreinstellungen an"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
msgstr "|DATEI|Konfigurationsdateien mittels DATEI ändern"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr "Hole die Einstellungsverzeichnisse von @GPGCONF@"
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
msgid "list global configuration file"
msgstr "Zeige die globale Konfigurationsdatei an"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
msgid "check global configuration file"
msgstr "Prüfe die globale Konfigurationsdatei"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
msgid "query the software version database"
msgstr "Abfrage der Datenbank mit Softwareversionen"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr "\"reload\" an alle oder eine Komponente senden"
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr "Die angegebene Komponente starten"
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr "\"kill\" an eine Komponente senden"
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "Als Ausgabedatei benutzen"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr "Aktiviere Änderungen zur Laufzeit; falls möglich"
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Gebrauch: @GPGCONF@ [Optionen] (-h für Hilfe)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10863,15 -8602,12 +10858,15 @@@ msgstr "
"Syntax: @GPGCONF@ {Optionen]\n"
"Verwalte Konfigurationsoptionen für Programme des @GNUPG@ Systems\n"
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr "Benötige ein Komponentenargument"
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
msgid "Component not found"
msgstr "Komponente nicht gefunden"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
msgid "No argument allowed"
msgstr "Argumente sind nicht erlaubt"
diff --cc po/el.po
index 0b85488,749b333..2c276c4
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2017-09-14 21:14+0300\n"
"Last-Translator: Dimitris Maroulidis <dmaroulidis at dimitrismaroulidis.com>\n"
"Language-Team: team at gnome.gr\n"
@@@ -158,26 -129,11 +158,26 @@@ msgstr "κακή φράση κλειδ�
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:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -382,8 -299,6 +382,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "αλλαγή της φράσης κλειδί"
- #: agent/gpg-agent.c:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -393,124 -308,92 +393,124 @@@ msgstr "
"Επιλογές:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "Το κλειδί έχει παρακαμθεί"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "αναλυτικά"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ήσυχη έξοδος"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "αναζήτηση κλειδιών σε ένα διακομιστή κλειδιών"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|ΟΝΟΜΑ|καθορισμός του σετ χαρακτήρων τερματικού σε ΟΝΟΜΑ"
- #: agent/gpg-agent.c:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
#, fuzzy
msgid "allow presetting passphrase"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "δεν υποστηρίζεται"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -519,167 -402,119 +519,162 @@@ msgstr "δεν υποστηρίζετα
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "ο επιλεγμένος αλγόριθμος περίληψης δεν είναι έγκυρος\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 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:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "ανάγνωση επιλογών από `%s'\n"
- #: agent/gpg-agent.c:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "αδυναμία δημιουργίας του %s: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδρία\n"
- #: agent/gpg-agent.c:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
- #: agent/gpg-agent.c:2241 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
- #, fuzzy, c-format
- msgid "listen() failed: %s\n"
- msgstr "η ενημέρωση απέτυχε: %s\n"
-
- #: agent/gpg-agent.c:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: read απέτυχε (n=%d): %s\n"
- #: agent/gpg-agent.c:2327
++#: agent/gpg-agent.c:2351
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: αδυναμία δημιουργίας καταλόγου: %s\n"
- #: agent/gpg-agent.c:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2771
++#: agent/gpg-agent.c:2795
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "η ενημέρωση μυστικού απέτυχε: %s\n"
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: παραλείφθηκε: %s\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδρία\n"
@@@ -695,8 -528,6 +690,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -704,9 -535,6 +699,9 @@@ msgstr "
"@Εντολές:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -760,8 -580,6 +755,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:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@@ -945,8 -728,6 +940,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@@ -1422,7 -1105,6 +1417,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
#, fuzzy
msgid "out of core\n"
msgstr "μη επεξεργασμένο"
@@@ -1481,8 -1152,6 +1476,8 @@@ msgstr "το δημόσιο κλειδ�
msgid "waiting for lock %s...\n"
msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1668,8 -1300,6 +1663,8 @@@ msgstr "το μυστικό κλειδ�
msgid "OpenPGP card no. %s detected\n"
msgstr ""
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "δεν μπορεί να γίνει αυτό σε κατάσταση δέσμης (batchmode)\n"
@@@ -1684,10 -1312,6 +1679,10 @@@ msgstr "Αυτή η εντολή απα
msgid "Reset Code not or not anymore available\n"
msgstr "τμήματα του μυστικού κλειδιού δεν είναι διαθέσιμα\n"
+#: g10/card-util.c:142 g10/card-util.c:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Η επιλογή σας; "
@@@ -1749,17 -1360,11 +1744,17 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "κανένα αντίστιχο δημόσιο κλειδί: %s\n"
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
- #: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
@@@ -1816,7 -1410,6 +1811,7 @@@ msgstr "Η δημιουργία κλε�
msgid "not an OpenPGP card"
msgstr "δε βρέθηκαν έγκυρα OpenPGP δεδομένα.\n"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
@@@ -1852,13 -1439,10 +1847,13 @@@ msgstr "Τι μέγεθος κλειδ�
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr ""
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "στρογγυλοποιήθηκε έως τα %u bits\n"
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1913,9 -1487,6 +1908,9 @@@ msgstr " (%d) RSA (για κρυπτ�
msgid " (3) Authentication key\n"
msgstr ""
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Μη έγκυρη επιλογή.\n"
@@@ -2056,22 -1597,14 +2051,22 @@@ msgstr "--output δεν λειτουρ�
msgid "can't open '%s'\n"
msgstr "αδυναμία πρόσβασης του `%s'\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "σφάλμα κατά την ανάγνωση του μπλοκ κλειδιών: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
@@@ -2169,8 -1684,6 +2164,8 @@@ msgstr "
"ο εξαναγκασμός συμμετρικού αλγόριθμου %s (%d) παραβιάζει τις\n"
"επιλογές του παραλήπτη\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, fuzzy, c-format
msgid "cipher algorithm '%s' may not be used in %s mode\n"
msgstr "απαγορεύετε η χρήση του κρυπταλγόριθμου \"%s\" στην κατάσταση %s\n"
@@@ -2201,7 -1710,6 +2196,7 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s κρυπτογραφήθηκε για: \"%s\"\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2328,28 -1812,22 +2323,28 @@@ msgstr "%s: παραλείφθηκε: %
msgid "writing to '%s'\n"
msgstr "εγγραφή στο `%s'\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, fuzzy, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr ""
"κλειδί %08lX: η υπογραφή του υποκλειδιού σε λάθος σημείο - παραλείφθηκε\n"
- #: g10/export.c:1904
++#: g10/export.c:1909
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "κλειδί %08lX: κλειδί τύπου PGP 2.x - παραλείφθηκε\n"
- #: g10/export.c:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έγινε καμμία εξαγωγή\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2360,13 -1837,10 +2355,13 @@@ msgstr "σφάλμα κατά τη δη
msgid "[User ID not found]"
msgstr "[User id δεν βρέθηκε]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2376,61 -1849,50 +2371,61 @@@
msgid "error looking up: %s\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "σφάλμα κατά τη δημιουργία του `%s': %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "σφάλμα κατά τη δημιουργία του `%s': %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
#, fuzzy
msgid "No fingerprint"
msgstr "απεικόνιση του fingerprint"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "το μυστικό κλειδί `%s' δε βρέθηκε: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "χρήση του δευτερεύοντος κλειδιού %08lX αντί του πρωτεύοντος %08lX\n"
- #: g10/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
@@@ -2640,7 -2056,6 +2635,7 @@@ msgstr "χρήση κανονικής �
msgid "|FILE|write output to FILE"
msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "να μη γίνει καμμία αλλαγή"
@@@ -3033,7 -2375,6 +3028,7 @@@ msgstr "%s:%d: μη έγκυρες επ
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το πρόγραμμα ίσως δημιουργήσει αρχείο core!\n"
@@@ -3052,7 -2390,6 +3047,7 @@@ msgstr "το %s δεν επιτρέπε
msgid "%s makes no sense with %s!\n"
msgstr "το %s δεν έχει καμμία έννοια μαζί με το %s!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr ""
@@@ -3061,7 -2397,6 +3056,7 @@@
msgid "will not run with insecure memory due to %s\n"
msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
- #: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "ο επιλεγμένος αλγόριθμος κρυπτογράφησης δεν είναι έγκυρος\n"
@@@ -3128,8 -2449,6 +3123,8 @@@ msgstr "μη έγκυρες προεπ�
msgid "%s does not yet work with %s\n"
msgstr "το %s ακόμα δε λειτουργεί μαζί με το %s\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr ""
@@@ -3262,7 -2555,6 +3257,7 @@@ msgstr "εξαγωγή των κλει�
msgid "make timestamp conflicts only a warning"
msgstr "ορισμός των συγκρούσεων ώρας (timestamp) μόνο σαν προειδοποίηση"
- #: g10/gpgv.c:84 sm/gpgsm.c:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|εγγραφή των πληροφοριών κατάστασης στο FD"
@@@ -4649,7 -3667,6 +4644,7 @@@ msgstr "Σίγουρα ακόμα θέ�
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Δεν μπορείτε να προσθέσετε μια photo ID σε ένα κλειδί τύπου PGP2.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr ""
@@@ -4965,54 -3921,42 +4960,54 @@@ msgstr "πάρα πολλές `%c' πρ
msgid "too many compression preferences\n"
msgstr "πάρα πολλές `%c' προεπιλογές\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "μη έγκυρος χαρακτήρας στο \"κορδόνι\" της επιλογής\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "εγγραφή άμεσης υπογραφής\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "εγγραφή ιδιο-υπογραφής\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "εγγραφή υπογραφής \"δέσιμου\" κλειδιού\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "μη έγκυρο μέγεθος κλειδιού, χρήση %u bits\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "στρογγυλοποίηση του μέγεθος κλειδιού έως %u bits\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
#, fuzzy
msgid "Sign"
msgstr "sign"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
#, fuzzy
msgid "Encrypt"
msgstr "κρυπτογράφηση δεδομένων"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr ""
@@@ -5026,157 -3970,126 +5021,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (για κρυπτογράφηση μόνο)\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Παρακαλώ επιλέξτε τον τύπο του κλειδιού που θέλετε:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA και ElGamal (προκαθορισμένο)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA και ElGamal (προκαθορισμένο)\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (για υπογραφή μόνο)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (για υπογραφή μόνο)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (για κρυπτογράφηση μόνο)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA και ElGamal (προκαθορισμένο)\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (για υπογραφή μόνο)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Σημείωση υπογραφής: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "στρογγυλοποιήθηκε έως τα %u bits\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Το μέγεθος κλειδιού που ζητήθηκε είναι %u bits\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Παρακαλώ επιλέξτε τον τύπο του κλειδιού που θέλετε:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5192,7 -4105,6 +5187,7 @@@ msgstr "
" <n>m = το κλειδί λήγει σε n μήνες\n"
" <n>y = το κλειδί λήγει σε n έτη\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5208,40 -4120,32 +5203,40 @@@ msgstr "
" <n>m = το κλειδί λήγει σε n μήνες\n"
" <n>y = το κλειδί λήγει σε n έτη\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "Το κλειδί είναι έγκυρο για; (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Η υπογραφή έιναι έγκυρη για; (0) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "μη έγκυρη τιμή\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "το %s δεν λήγει ποτέ\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "το %s δεν λήγει ποτέ\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "το %s λήγει στις %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Υπογραφή λήγει στις %s.\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5249,12 -4153,10 +5244,12 @@@ msgstr "
"Το σύστημα σας δεν μπορεί να απεικονίσει ημερομηνίες πέρα του 2038.\n"
"Όμως, θα χειρίζονται σωστά έως το 2106.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Είναι αυτό σωστό (y/n); "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5265,7 -4167,6 +5260,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
#, fuzzy
msgid ""
"\n"
@@@ -5282,50 -4183,39 +5277,50 @@@ msgstr "
" \"Nikolaoy Nikos (toy Ioanni) <nikoln at athens.gr>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Αληθινό Όνομα: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Μη έγκυρος χαρακτήρας στο όνομα\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "Το όνομα δεν επιτρέπεται να ξεκινά με αριθμητικό ψηφίο\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "Το όνομα πρέπει να έχει τουλάχιστον 5 χαρακτήρες\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "Διεύθυνση Email: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "Μη έγκυρη διεύθυνση Email\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Σχόλιο: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Μη έγκυρος χαρακτήρας στο σχόλιο\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Χρησιμοποιείτε το `%s' σετ χαρακτήρων.\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5336,7 -4226,6 +5331,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Παρακαλώ μην τοποθετείτε την διεύθυνση email στο όνομα ή στο σχόλιο\n"
@@@ -5351,35 -4240,28 +5346,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (Q)τερματισμός; "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (O)εντάξει/(Q)τερματισμός; "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (Q)τερματισμός; "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (O)εντάξει/(Q)τερματισμός; "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Παρακαλώ, διορθώστε πρώτα το σφάλμα\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
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"
@@@ -5391,13 -4273,10 +5386,13 @@@ msgstr "
"τους δίσκους) κατα τη διάρκεια υπολογισμού πρώτων αριθμών. Αυτό δίνει\n"
"στη γεννήτρια τυχαίων αριθμών μια ευκαιρία να μαζέψει αρκετή εντροπία.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Η δημιουργία κλειδιού απέτυχε: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5405,66 -4284,53 +5400,66 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' ήδη συμπιέστηκε\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "Χρήση οπωσδήποτε αυτού του κλειδιού; "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
#, fuzzy
msgid "creating anyway\n"
msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Η δημιουργία κλειδιού αναβλήθηκε.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "αδυναμία δημιουργίας του `%s': %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "ΣΗΜΕΙΩΣΗ: το μυστικό κλειδί %08lX έληξε στις %s\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "εγγραφή του δημοσίου κλειδιού στο `%s'\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "δε βρέθηκε εγγράψιμη δημόσια κλειδοθήκη: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "αδυναμία εγγραφής δημόσιας κλειδοθήκης `%s': %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "το δημόσιο και το μυστικό κλειδί δημιουργήθηκαν και υπογράφηκαν.\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5475,7 -4341,6 +5470,7 @@@ msgstr "
"Μπορείτε να χρησιμοποιήσετε την εντολή \"--edit-key\" για να δημιουργηθεί\n"
"ένα δευτερεύον κλειδί για αυτό το λόγο.\n"
- #: g10/keygen.c:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5483,7 -4348,6 +5478,7 @@@ msgstr "
"το κλειδί δημιουργήθηκε %lu δευτερόλεπτο στο μέλλον (χρονοδίνη ή\n"
"απλώς πρόβλημα στο ρολόι)\n"
- #: g10/keygen.c:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5491,7 -4355,6 +5486,7 @@@ msgstr "
"το κλειδί δημιουργήθηκε %lu δευτερόλεπτα στο μέλλον (χρονοδίνη ή\n"
"απλώς πρόβλημα στο ρολόι)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
#, 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"
@@@ -5499,16 -4362,13 +5494,16 @@@ msgstr "
"ΣΗΜΕΙΩΣΗ: η δημιουργία υποκλειδιών για κλειδιά v3 δεν είναι σύμφωνο\n"
"με το OpenPGP\n"
- #: g10/keygen.c:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
msgid "Secret parts of primary key are not available.\n"
msgstr "Μυστικά τμήματα του κύριου κλειδιού δεν είναι διαθέσιμα.\n"
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Μυστικά τμήματα του κύριου κλειδιού δεν είναι διαθέσιμα.\n"
- #: g10/keygen.c:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Σίγουρα να δημιουργηθεί; "
@@@ -6256,23 -4970,18 +6251,23 @@@ msgstr "Είναι αυτή η φωτο
msgid "unable to display photo ID!\n"
msgstr "αδυναμία απεικόνισης του photo ID!\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Δεν έχει οριστεί αιτία"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "Το κλειδί έχει παρακαμθεί"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "Το κλειδί έχει εκτεθεί"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "Το κλειδί δε χρησιμοποιείται πλέον"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "Το User ID δεν είναι πλέον έγκυρο"
@@@ -6353,7 -5049,6 +6348,7 @@@ msgid "
"\n"
msgstr ""
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Η απόφαση σας; "
@@@ -6506,46 -5173,37 +6501,46 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Δεν είναι βέβαιο ότι η υπογραφή ανήκει στον ιδιοκτήτη.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: παραλείφθηκε: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: παραλείφθηκε: το δημόσιο κλειδί έχει απενεργοποιηθεί.\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: παραλείφθηκε: δημόσιο κλειδί είναι ήδη παρόν\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "αδυναμία σύνδεσης στο `%s': %s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "μη έγκυρος αλγόριθμος hash `%s'\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "μη έγκυρος αλγόριθμος hash `%s'\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Δεν ορίστηκε ένα user ID. (χρησιμοποιείστε το \"-r\")\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6553,38 -5211,30 +6548,38 @@@ msgstr "
"\n"
"Πληκτρολογήστε το user ID. Τέλος με μια άδεια γραμμή: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Δεν υπάρχει αυτό το user ID.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr ""
"παραλείφθηκε: δημόσιο κλειδί έχει ήδη οριστεί σαν εξ ορισμού παραλήπτης\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "Το δημόσιο κλειδί έχει απενεργοποιηθεί.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "παραλείφθηκε: δημόσιο κλειδί έχει ήδη οριστεί\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "καμμία έγκυρη διεύθυνση\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "κλειδί %08lX: δεν υπάρχει αυτό το user ID\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "κλειδί %08lX: δεν υπάρχει αυτό το user ID\n"
@@@ -6689,7 -5317,6 +6684,7 @@@ msgstr "Το μυστικό κλειδ�
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Δημιουργία ενός πιστοποιητικού ανάκλησης για αυτό το κλειδί; "
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "Εξαναγκασμός εξόδου σε θωρακισμένο ASCII.\n"
@@@ -6707,19 -5331,16 +6702,19 @@@ msgstr "Πιστοποιητικό αν
msgid "no revocation keys found for \"%s\"\n"
msgstr "δε βρέθηκαν κλειδιά ανάκλησης για το `%s'\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Δημιουργία ενός πιστοποιητικού ανάκλησης για αυτό το κλειδί; "
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6728,20 -5349,17 +6723,20 @@@
"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:577
++#: g10/revoke.c:590
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "το μυστικό κλειδί `%s' δε βρέθηκε: %s\n"
@@@ -6749,23 -5367,19 +6744,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Δημιουργία ενός πιστοποιητικού ανάκλησης για αυτό το κλειδί; "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6784,33 -5398,26 +6779,33 @@@ msgstr "
"προσοχή το σύστημα εκτύπωσης στο μηχανημά σας μπορεί να αποθηκεύσει την\n"
"εκτύπωση και να την κάνει διαθέσιμη σε άλλους!\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Ακύρωση"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Πιθανών να θέλετε να επιλέξετε το %d εδώ)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Πληκτρολογήστε μια προαιρετική περιγραφή· τέλος με μια άδεια γραμμή:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Αιτία για ανάκληση: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(Δεν δώθηκε περιγραφή)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Είναι αυτό εντάξει; "
@@@ -7226,10 -5759,6 +7221,10 @@@ msgstr "σφάλμα στη δημιο�
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
@@@ -7261,7 -5785,6 +7256,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
@@@ -7573,18 -6047,14 +7568,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7650,7 -6108,6 +7645,7 @@@ msgstr "
msgid "no need for a trustdb check\n"
msgstr "δεν υπάρχει ανάγκη για έλεγχο της trustdb\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "επόμενος έλεγχος της trustdb θα γίνει στις %s\n"
@@@ -7678,14 -6130,12 +7673,14 @@@ msgstr "παρακαλώ κάντε έ�
msgid "checking the trustdb\n"
msgstr "έλεγχος της trustdb\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "%lu κλειδιά έχουν μέχρι τώρα επεξεργαστεί\n"
msgstr[1] "%lu κλειδιά έχουν μέχρι τώρα επεξεργαστεί\n"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7693,23 -6143,19 +7688,23 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d κλειδιά επεξεργάστηκαν (%d μετρήσεις εγγυρότητας πέρασαν)\n"
msgstr[1] "%d κλειδιά επεξεργάστηκαν (%d μετρήσεις εγγυρότητας πέρασαν)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "δε βρέθηκαν απόλυτα εμπιστεύσιμα κλειδιά\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr ""
"δε βρέθηκε το δημόσιο κλειδί του απόλυτα εμπιστεύσιμου κλειδιού %08lX\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "εγγραφή trust %lu, τύπος %d: write απέτυχε: %s\n"
@@@ -8140,76 -6500,60 +8135,76 @@@ msgstr "αλλαγή της φράση�
msgid "|N|Initial New PIN"
msgstr ""
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr ""
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
#, fuzzy
msgid "|NAME|use NAME as ct-API driver"
msgstr "|ΟΝΟΜΑ|χρήση του ΟΝΟΜΑτος ως προκαθορισμένου παραλήπτη"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
#, fuzzy
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|ΟΝΟΜΑ|χρήση του ΟΝΟΜΑτος ως προκαθορισμένου παραλήπτη"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
#, fuzzy
msgid "do not use the internal CCID driver"
msgstr "μη χρήση τερματικού"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr ""
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr ""
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
#, fuzzy
msgid "deny the use of admin card commands"
msgstr "συγκρουόμενες εντολές\n"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8928,7 -7119,6 +8923,7 @@@ msgstr "προσθήκη αυτού τ�
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|ΔΙΑΚΟΜΙΣΤΗΣ|χρήση αυτού του διακομιστή κλειδιών για αναζήτηση"
@@@ -8988,17 -7168,14 +8983,17 @@@ msgstr " s = παράλειψη αυτ�
msgid "could not parse keyserver\n"
msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "εγγραφή στο `%s'\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "αδυναμία κλεισίματος του `%s': %s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9953,116 -7940,88 +9948,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
#, fuzzy
msgid "run without asking a user"
msgstr "Τερματισμός χωρίς αποθήκευση; "
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10075,91 -8034,72 +10070,91 @@@ msgstr "
"@\n"
"(δείτε τη σελίδα man για μια πλήρη λίστα εντολών και επιλογών)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "χρήση: gpg [επιλογές] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
#, 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:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "θωράκιση απέτυχε: %s\n"
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "θωράκιση απέτυχε: %s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "η γραμμή είναι πολύ μεγάλη\n"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "σφάλμα ανάγνωσης: %s\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
#, fuzzy
msgid "shutdown forced\n"
msgstr "μη επεξεργασμένο"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10603,77 -8452,61 +10598,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "η υπογραφή απέτυχε: %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "η υπογραφή απέτυχε: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "αδυναμία δημιουργίας του `%s': %s\n"
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
#, 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:2632
++#: dirmngr/server.c:2738
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
- #: dirmngr/server.c:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10717,7 -8542,6 +10712,7 @@@ msgstr "η προεπιλογή %c%lu �
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
#, fuzzy
msgid "quiet"
msgstr "τερματισμός"
@@@ -10810,286 -8614,218 +10805,286 @@@ msgstr "η υπογραφή απέτυ�
msgid "error sending standard options: %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr ""
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr ""
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|χρήση της κατάστασης φράσης κλειδί N"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|ΟΝΟΜΑ|κρυπτογράφηση για ΟΝΟΜΑ"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|ΟΝΟΜΑ|χρήση αλγόριθμου κρυπτογράφησης ΟΝΟΜΑ για φράσεις κλειδιά"
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "σφάλμα δικτύου"
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
msgid "Passphrase Entry"
msgstr "κακή φράση κλειδί"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
#, fuzzy
msgid "Component not suitable for launching"
msgstr "δεν βρέθηκε το δημόσιο κλειδί"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
#, fuzzy
msgid "list global configuration file"
msgstr "άγνωστο αντικείμενο ρυθμίσεως \"%s\"\n"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
#, fuzzy
msgid "check global configuration file"
msgstr "άγνωστο αντικείμενο ρυθμίσεως \"%s\"\n"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "χρήση ως αρχείου εξόδου"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
#, fuzzy
msgid "Component not found"
msgstr "δεν βρέθηκε το δημόσιο κλειδί"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
#, fuzzy
msgid "No argument allowed"
msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
diff --cc po/en at boldquot.po
index ae64a97,0000000..c021cf9
mode 100644,000000..100644
--- a/po/en at boldquot.po
+++ b/po/en at boldquot.po
@@@ -1,10704 -1,0 +1,10699 @@@
+# 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.2.3\n"
++"Project-Id-Version: GNU gnupg 2.2.4\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-11-20 12:04+0100\n"
- "PO-Revision-Date: 2017-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
++"PO-Revision-Date: 2017-12-20 09:14+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: agent/call-pinentry.c:305
+#, 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:508
+msgid "|pinentry-label|_OK"
+msgstr "|pinentry-label|_OK"
+
+#: agent/call-pinentry.c:509
+msgid "|pinentry-label|_Cancel"
+msgstr "|pinentry-label|_Cancel"
+
+#: agent/call-pinentry.c:510
+msgid "|pinentry-label|_Yes"
+msgstr "|pinentry-label|_Yes"
+
+#: agent/call-pinentry.c:511
+msgid "|pinentry-label|_No"
+msgstr "|pinentry-label|_No"
+
+#: agent/call-pinentry.c:512
+msgid "|pinentry-label|PIN:"
+msgstr "|pinentry-label|PIN:"
+
+#: agent/call-pinentry.c:513
+msgid "|pinentry-label|_Save in password manager"
+msgstr "|pinentry-label|_Save in password manager"
+
+#: agent/call-pinentry.c:514
+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:516
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr "|pinentry-tt|Make passphrase visible"
+
+#: agent/call-pinentry.c:517
+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:849
+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:870
+msgid "pinentry.qualitybar.tooltip"
+msgstr "pinentry.qualitybar.tooltip"
+
+#: agent/call-pinentry.c:998
+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:1001
+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:1038 agent/call-pinentry.c:1217
+msgid "PIN:"
+msgstr "PIN:"
+
+#: agent/call-pinentry.c:1038 agent/call-pinentry.c:1217
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
+msgid "Passphrase:"
+msgstr "Passphrase:"
+
+#: agent/call-pinentry.c:1065 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:1085
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr "SETERROR %s (try %d of %d)"
+
+#: agent/call-pinentry.c:1096
+msgid "Repeat:"
+msgstr "Repeat:"
+
+#: agent/call-pinentry.c:1125 agent/call-pinentry.c:1137
+msgid "PIN too long"
+msgstr "PIN too long"
+
+#: agent/call-pinentry.c:1126
+msgid "Passphrase too long"
+msgstr "Passphrase too long"
+
+#: agent/call-pinentry.c:1134
+msgid "Invalid characters in PIN"
+msgstr "Invalid characters in PIN"
+
+#: agent/call-pinentry.c:1139
+msgid "PIN too short"
+msgstr "PIN too short"
+
+#: agent/call-pinentry.c:1152
+msgid "Bad PIN"
+msgstr "Bad PIN"
+
+#: agent/call-pinentry.c:1152
+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:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
+#, c-format
+msgid "can't open '%s': %s\n"
+msgstr "can't open '%s': %s\n"
+
+#: 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:2462
+#, c-format
+msgid "detected card with S/N: %s\n"
+msgstr "detected card with S/N: %s\n"
+
+#: 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:2487
+#, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "no suitable card key found: %s\n"
+
+#: 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: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:2795
+msgid "Allow"
+msgstr "Allow"
+
+#: agent/command-ssh.c:2795
+msgid "Deny"
+msgstr "Deny"
+
+#: 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:3053 agent/genkey.c:351
+msgid "Please re-enter this passphrase"
+msgstr "Please re-enter this passphrase"
+
+#: 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: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:117
+msgid "Please insert the card with serial number"
+msgstr "Please insert the card with serial number"
+
+#: 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:246
+msgid "Admin PIN"
+msgstr "Admin PIN"
+
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:251
+msgid "PUK"
+msgstr "PUK"
+
+#: agent/divert-scd.c:258
+msgid "Reset Code"
+msgstr "Reset Code"
+
+#: 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:356
+msgid "Repeat this Reset Code"
+msgstr "Repeat this Reset Code"
+
+#: agent/divert-scd.c:358
+msgid "Repeat this PUK"
+msgstr "Repeat this PUK"
+
+#: agent/divert-scd.c:359
+msgid "Repeat this PIN"
+msgstr "Repeat this PIN"
+
+#: 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:366
+msgid "PUK not correctly repeated; try again"
+msgstr "PUK not correctly repeated; try again"
+
+#: agent/divert-scd.c:367
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN not correctly repeated; try again"
+
+#: 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:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Options:\n"
+" "
+
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+msgid "run in daemon mode (background)"
+msgstr "run in daemon mode (background)"
+
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
+msgid "run in server mode (foreground)"
+msgstr "run in server mode (foreground)"
+
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
+msgid "run in supervised mode"
+msgstr "run in supervised mode"
+
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
+msgid "verbose"
+msgstr "verbose"
+
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
+msgid "be somewhat more quiet"
+msgstr "be somewhat more quiet"
+
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
+msgid "sh-style command output"
+msgstr "sh-style command output"
+
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
+msgid "csh-style command output"
+msgstr "csh-style command output"
+
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
+msgid "|FILE|read options from FILE"
+msgstr "|FILE|read options from FILE"
+
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr "do not detach from the console"
+
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
+msgid "use a log file for the server"
+msgstr "use a log file for the server"
+
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|use PGM as the PIN-Entry program"
+
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|use PGM as the SCdaemon program"
+
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
+msgid "do not use the SCdaemon"
+msgstr "do not use the SCdaemon"
+
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
+msgid "|NAME|accept some commands via NAME"
+msgstr "|NAME|accept some commands via NAME"
+
- #: agent/gpg-agent.c:208
++#: agent/gpg-agent.c:210
+msgid "ignore requests to change the TTY"
+msgstr "ignore requests to change the TTY"
+
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
+msgid "ignore requests to change the X display"
+msgstr "ignore requests to change the X display"
+
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
+msgid "|N|expire cached PINs after N seconds"
+msgstr "|N|expire cached PINs after N seconds"
+
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
+msgid "do not use the PIN cache when signing"
+msgstr "do not use the PIN cache when signing"
+
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
+msgid "disallow the use of an external password cache"
+msgstr "disallow the use of an external password cache"
+
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
+msgid "disallow clients to mark keys as \"trusted\""
+msgstr "disallow clients to mark keys as “[1mtrusted[0m”"
+
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
+msgid "allow presetting passphrase"
+msgstr "allow presetting passphrase"
+
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
+msgid "disallow caller to override the pinentry"
+msgstr "disallow caller to override the pinentry"
+
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
+msgid "allow passphrase to be prompted through Emacs"
+msgstr "allow passphrase to be prompted through Emacs"
+
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
+msgid "enable ssh support"
+msgstr "enable ssh support"
+
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr "|ALGO|use ALGO to show ssh fingerprints"
+
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
+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:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
+msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
+msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
+
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
+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:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
+#, c-format
+msgid "invalid debug-level '%s' given\n"
+msgstr "invalid debug-level ‘[1m%s[0m’ given\n"
+
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
+msgid "selected digest algorithm is invalid\n"
+msgstr "selected digest algorithm is invalid\n"
+
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Note: no default option file ‘[1m%s[0m’\n"
+
- #: agent/gpg-agent.c:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 tools/symcryptrun.c:944
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "option file '%s': %s\n"
+
- #: agent/gpg-agent.c:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
+#, c-format
+msgid "reading options from '%s'\n"
+msgstr "reading options from ‘[1m%s[0m’\n"
+
- #: agent/gpg-agent.c:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
+#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
+#, c-format
+msgid "can't create socket: %s\n"
+msgstr "can't create socket: %s\n"
+
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
+#, c-format
+msgid "socket name '%s' is too long\n"
+msgstr "socket name ‘[1m%s[0m’ is too long\n"
+
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
+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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
+msgid "error getting nonce for the socket\n"
+msgstr "error getting nonce for the socket\n"
+
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
+#, c-format
+msgid "error binding socket to '%s': %s\n"
+msgstr "error binding socket to '%s': %s\n"
+
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
+#, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "can't set permissions of '%s': %s\n"
+
- #: agent/gpg-agent.c:2241 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
- #, c-format
- msgid "listen() failed: %s\n"
- msgstr "listen() failed: %s\n"
-
- #: agent/gpg-agent.c:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
+#, c-format
+msgid "listening on socket '%s'\n"
+msgstr "listening on socket ‘[1m%s[0m’\n"
+
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
+#, c-format
+msgid "stat() failed for '%s': %s\n"
+msgstr "stat() failed for '%s': %s\n"
+
- #: agent/gpg-agent.c:2327
++#: agent/gpg-agent.c:2351
+#, 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:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
+#, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "error reading nonce on fd %d: %s\n"
+
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
+msgstr "handler 0x%lx for fd %d started\n"
+
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr "handler 0x%lx for fd %d terminated\n"
+
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
+#, 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:2771
++#: agent/gpg-agent.c:2795
+#, 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:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
+#, c-format
+msgid "npth_pselect failed: %s - waiting 1s\n"
+msgstr "npth_pselect failed: %s - waiting 1s\n"
+
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
+#, c-format
+msgid "%s %s stopped\n"
+msgstr "%s %s stopped\n"
+
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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: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: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:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Commands:\n"
+" "
+
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 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:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
+#, 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: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: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:1515 agent/findkey.c:1529
+msgid "Delete key"
+msgstr "Delete key"
+
+#: 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: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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
+#, 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: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: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: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:890
+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 g10/gpg.c:3494
+#, 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:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
+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:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
+#, 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:225
+#, 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: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: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:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
+#, c-format
+msgid "WARNING: %s\n"
+msgstr "WARNING: %s\n"
+
+#: g10/call-agent.c:214 sm/call-agent.c:113 sm/call-dirmngr.c:180
+msgid "Note: Outdated servers may lack important security fixes.\n"
+msgstr "Note: Outdated servers may lack important security fixes.\n"
+
+#: g10/call-agent.c:216 sm/call-agent.c:115 sm/call-dirmngr.c:182
+#, c-format
+msgid "Note: Use the command \"%s\" to restart them.\n"
+msgstr "Note: Use the command “[1m%s[0m” to restart them.\n"
+
+#: g10/call-agent.c:301 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
+#: sm/call-agent.c:191 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:1775
+#, 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:1781
+#, 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:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
+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: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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 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:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
+#, c-format
+msgid "error reading '%s': %s\n"
+msgstr "error reading '%s': %s\n"
+
- #: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
+#, c-format
+msgid "error writing '%s': %s\n"
+msgstr "error writing '%s': %s\n"
+
+#: g10/card-util.c:928
+msgid "Login data (account name): "
+msgstr "Login data (account name): "
+
+#: g10/card-util.c:966
+msgid "Private DO data: "
+msgstr "Private DO data: "
+
+#: g10/card-util.c:1051
+msgid "Language preferences: "
+msgstr "Language preferences: "
+
+#: 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:1068
+msgid "Error: invalid characters in preference string.\n"
+msgstr "Error: invalid characters in preference string.\n"
+
+#: 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:1104
+msgid "Error: invalid response.\n"
+msgstr "Error: invalid response.\n"
+
+#: g10/card-util.c:1126
+msgid "CA fingerprint: "
+msgstr "CA fingerprint: "
+
+#: g10/card-util.c:1149
+msgid "Error: invalid formatted fingerprint.\n"
+msgstr "Error: invalid formatted fingerprint.\n"
+
+#: 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:1200
+msgid "not an OpenPGP card"
+msgstr "not an OpenPGP card"
+
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
+#, c-format
+msgid "error getting current key info: %s\n"
+msgstr "error getting current key info: %s\n"
+
+#: g10/card-util.c:1300
+msgid "Replace existing key? (y/N) "
+msgstr "Replace existing key? (y/N) "
+
+#: 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: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: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: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:1358
+#, c-format
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr "The card will now be re-configured to generate a key of type: %s\n"
+
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: 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:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 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:1382
+#, 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:1410
+#, 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:1434
+msgid "Make off-card backup of encryption key? (Y/n) "
+msgstr "Make off-card backup of encryption key? (Y/n) "
+
+#: g10/card-util.c:1448
+msgid "Note: keys are already stored on the card!\n"
+msgstr "Note: keys are already stored on the card!\n"
+
+#: g10/card-util.c:1451
+msgid "Replace existing keys? (y/N) "
+msgstr "Replace existing keys? (y/N) "
+
+#: g10/card-util.c:1463
+#, 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:1529
+msgid "Please select the type of key to generate:\n"
+msgstr "Please select the type of key to generate:\n"
+
+#: g10/card-util.c:1531 g10/card-util.c:1651
+msgid " (1) Signature key\n"
+msgstr " (1) Signature key\n"
+
+#: g10/card-util.c:1532 g10/card-util.c:1653
+msgid " (2) Encryption key\n"
+msgstr " (2) Encryption key\n"
+
+#: g10/card-util.c:1533 g10/card-util.c:1655
+msgid " (3) Authentication key\n"
+msgstr " (3) Authentication key\n"
+
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
+msgid "Invalid selection.\n"
+msgstr "Invalid selection.\n"
+
+#: g10/card-util.c:1648
+msgid "Please select where to store the key:\n"
+msgstr "Please select where to store the key:\n"
+
+#: g10/card-util.c:1694
+#, c-format
+msgid "KEYTOCARD failed: %s\n"
+msgstr "KEYTOCARD failed: %s\n"
+
+#: g10/card-util.c:1787
+msgid "This command is not supported by this card\n"
+msgstr "This command is not supported by this card\n"
+
+#: g10/card-util.c:1792
+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:1795
+msgid "Continue? (y/N) "
+msgstr "Continue? (y/N) "
+
+#: g10/card-util.c:1800
+msgid "Really do a factory reset? (enter \"yes\") "
+msgstr "Really do a factory reset? (enter “[1myes[0m”) "
+
+#: g10/card-util.c:1875 g10/keyedit.c:1256
+msgid "quit this menu"
+msgstr "quit this menu"
+
+#: g10/card-util.c:1877
+msgid "show admin commands"
+msgstr "show admin commands"
+
+#: g10/card-util.c:1878 g10/keyedit.c:1259
+msgid "show this help"
+msgstr "show this help"
+
+#: g10/card-util.c:1880
+msgid "list all available data"
+msgstr "list all available data"
+
+#: g10/card-util.c:1883
+msgid "change card holder's name"
+msgstr "change card holder's name"
+
+#: g10/card-util.c:1884
+msgid "change URL to retrieve key"
+msgstr "change URL to retrieve key"
+
+#: g10/card-util.c:1885
+msgid "fetch the key specified in the card URL"
+msgstr "fetch the key specified in the card URL"
+
+#: g10/card-util.c:1886
+msgid "change the login name"
+msgstr "change the login name"
+
+#: g10/card-util.c:1887
+msgid "change the language preferences"
+msgstr "change the language preferences"
+
+#: g10/card-util.c:1888
+msgid "change card holder's sex"
+msgstr "change card holder's sex"
+
+#: g10/card-util.c:1889
+msgid "change a CA fingerprint"
+msgstr "change a CA fingerprint"
+
+#: g10/card-util.c:1890
+msgid "toggle the signature force PIN flag"
+msgstr "toggle the signature force PIN flag"
+
+#: g10/card-util.c:1891
+msgid "generate new keys"
+msgstr "generate new keys"
+
+#: g10/card-util.c:1892
+msgid "menu to change or unblock the PIN"
+msgstr "menu to change or unblock the PIN"
+
+#: g10/card-util.c:1893
+msgid "verify the PIN and list all data"
+msgstr "verify the PIN and list all data"
+
+#: g10/card-util.c:1894
+msgid "unblock the PIN using a Reset Code"
+msgstr "unblock the PIN using a Reset Code"
+
+#: g10/card-util.c:1895
+msgid "destroy all keys and data"
+msgstr "destroy all keys and data"
+
+#: g10/card-util.c:2019
+msgid "gpg/card> "
+msgstr "gpg/card> "
+
+#: g10/card-util.c:2060
+msgid "Admin-only command\n"
+msgstr "Admin-only command\n"
+
+#: g10/card-util.c:2091
+msgid "Admin commands are allowed\n"
+msgstr "Admin commands are allowed\n"
+
+#: g10/card-util.c:2093
+msgid "Admin commands are not allowed\n"
+msgstr "Admin commands are not allowed\n"
+
+#: g10/card-util.c:2188 g10/keyedit.c:2224
+msgid "Invalid command (try \"help\")\n"
+msgstr "Invalid command (try “[1mhelp[0m”)\n"
+
+#: 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:5017 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:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 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
++#: g10/delkey.c:118 g10/getkey.c:582
+#, 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:244 g10/sign.c:1336
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "error creating passphrase: %s\n"
+
+#: 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:265
+#, c-format
+msgid "using cipher %s\n"
+msgstr "using cipher %s\n"
+
+#: 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: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:570
+#, c-format
+msgid "reading from '%s'\n"
+msgstr "reading from ‘[1m%s[0m’\n"
+
+#: 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:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
+#, 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: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:970
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s encrypted for: “[1m%s[0m”\n"
+
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
+#, c-format
+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:94 g10/mainproc.c:305
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s encrypted data\n"
+
+#: 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: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: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:1236
+msgid " - skipped"
+msgstr " - skipped"
+
+#: g10/export.c:1269 g10/import.c:1835 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:1709
++#: g10/export.c:1714
+#, c-format
+msgid "key %s: key material on-card - skipped\n"
+msgstr "key %s: key material on-card - skipped\n"
+
- #: g10/export.c:1904
++#: g10/export.c:1909
+msgid "exporting secret keys not allowed\n"
+msgstr "exporting secret keys not allowed\n"
+
- #: g10/export.c:1981
++#: g10/export.c:1986
+#, 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:2068
++#: g10/export.c:2073
+msgid "WARNING: nothing exported\n"
+msgstr "WARNING: nothing exported\n"
+
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
+#, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "(check argument of option '%s')\n"
+
- #: g10/getkey.c:515
++#: g10/getkey.c:509
+#, 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
++#: g10/getkey.c:638
+#, 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:1452
++#: g10/getkey.c:1460
+#, c-format
+msgid "automatically retrieved '%s' via %s\n"
+msgstr "automatically retrieved ‘[1m%s[0m’ via %s\n"
+
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
+#, c-format
+msgid "error retrieving '%s' via %s: %s\n"
+msgstr "error retrieving ‘[1m%s[0m’ via %s: %s\n"
+
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
+msgid "No fingerprint"
+msgstr "No fingerprint"
+
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "secret key “[1m%s[0m” not found: %s\n"
+
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
+#, 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:2042
++#: g10/getkey.c:2050
+#, 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:2049
++#: g10/getkey.c:2057
+#, c-format
+msgid "all values passed to '%s' ignored\n"
+msgstr "all values passed to ‘[1m%s[0m’ ignored\n"
+
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
+#, 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:3716
++#: g10/getkey.c:3724
+#, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "using subkey %s instead of primary key %s\n"
+
- #: g10/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
+#, c-format
+msgid "valid values for option '%s':\n"
+msgstr "valid values for option '%s':\n"
+
+#: g10/gpg.c:434 sm/gpgsm.c:201
+msgid "make a signature"
+msgstr "make a signature"
+
+#: g10/gpg.c:435
+msgid "make a clear text signature"
+msgstr "make a clear text signature"
+
+#: g10/gpg.c:437 sm/gpgsm.c:203
+msgid "make a detached signature"
+msgstr "make a detached signature"
+
+#: g10/gpg.c:438 sm/gpgsm.c:204
+msgid "encrypt data"
+msgstr "encrypt data"
+
+#: g10/gpg.c:440
+msgid "encryption only with symmetric cipher"
+msgstr "encryption only with symmetric cipher"
+
+#: g10/gpg.c:442 sm/gpgsm.c:206
+msgid "decrypt data (default)"
+msgstr "decrypt data (default)"
+
+#: g10/gpg.c:444 sm/gpgsm.c:207
+msgid "verify a signature"
+msgstr "verify a signature"
+
+#: g10/gpg.c:446 sm/gpgsm.c:208
+msgid "list keys"
+msgstr "list keys"
+
+#: g10/gpg.c:448
+msgid "list keys and signatures"
+msgstr "list keys and signatures"
+
+#: g10/gpg.c:451
+msgid "list and check key signatures"
+msgstr "list and check key signatures"
+
+#: g10/gpg.c:453 sm/gpgsm.c:213
+msgid "list keys and fingerprints"
+msgstr "list keys and fingerprints"
+
+#: g10/gpg.c:454 sm/gpgsm.c:211
+msgid "list secret keys"
+msgstr "list secret keys"
+
+#: g10/gpg.c:456 sm/gpgsm.c:214
+msgid "generate a new key pair"
+msgstr "generate a new key pair"
+
+#: g10/gpg.c:459
+msgid "quickly generate a new key pair"
+msgstr "quickly generate a new key pair"
+
+#: g10/gpg.c:462
+msgid "quickly add a new user-id"
+msgstr "quickly add a new user-id"
+
+#: g10/gpg.c:467
+msgid "quickly revoke a user-id"
+msgstr "quickly revoke a user-id"
+
+#: g10/gpg.c:470
+msgid "quickly set a new expiration date"
+msgstr "quickly set a new expiration date"
+
+#: g10/gpg.c:473
+msgid "full featured key pair generation"
+msgstr "full featured key pair generation"
+
+#: g10/gpg.c:476
+msgid "generate a revocation certificate"
+msgstr "generate a revocation certificate"
+
+#: g10/gpg.c:479 sm/gpgsm.c:217
+msgid "remove keys from the public keyring"
+msgstr "remove keys from the public keyring"
+
+#: g10/gpg.c:481
+msgid "remove keys from the secret keyring"
+msgstr "remove keys from the secret keyring"
+
+#: g10/gpg.c:483
+msgid "quickly sign a key"
+msgstr "quickly sign a key"
+
+#: g10/gpg.c:485
+msgid "quickly sign a key locally"
+msgstr "quickly sign a key locally"
+
+#: g10/gpg.c:486
+msgid "sign a key"
+msgstr "sign a key"
+
+#: g10/gpg.c:487
+msgid "sign a key locally"
+msgstr "sign a key locally"
+
+#: g10/gpg.c:488
+msgid "sign or edit a key"
+msgstr "sign or edit a key"
+
+#: g10/gpg.c:490 sm/gpgsm.c:235
+msgid "change a passphrase"
+msgstr "change a passphrase"
+
+#: g10/gpg.c:494
+msgid "export keys"
+msgstr "export keys"
+
+#: g10/gpg.c:495
+msgid "export keys to a keyserver"
+msgstr "export keys to a keyserver"
+
+#: g10/gpg.c:496
+msgid "import keys from a keyserver"
+msgstr "import keys from a keyserver"
+
+#: g10/gpg.c:499
+msgid "search for keys on a keyserver"
+msgstr "search for keys on a keyserver"
+
+#: g10/gpg.c:501
+msgid "update all keys from a keyserver"
+msgstr "update all keys from a keyserver"
+
+#: g10/gpg.c:507
+msgid "import/merge keys"
+msgstr "import/merge keys"
+
+#: g10/gpg.c:510
+msgid "print the card status"
+msgstr "print the card status"
+
+#: g10/gpg.c:511
+msgid "change data on a card"
+msgstr "change data on a card"
+
+#: g10/gpg.c:513
+msgid "change a card's PIN"
+msgstr "change a card's PIN"
+
+#: g10/gpg.c:525
+msgid "update the trust database"
+msgstr "update the trust database"
+
+#: g10/gpg.c:534
+msgid "print message digests"
+msgstr "print message digests"
+
+#: g10/gpg.c:537 sm/gpgsm.c:230
+msgid "run in server mode"
+msgstr "run in server mode"
+
+#: g10/gpg.c:539
+msgid "|VALUE|set the TOFU policy for a key"
+msgstr "|VALUE|set the TOFU policy for a key"
+
+#: g10/gpg.c:543 sm/gpgsm.c:249
+msgid "create ascii armored output"
+msgstr "create ascii armored output"
+
+#: g10/gpg.c:546 sm/gpgsm.c:265
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|encrypt for USER-ID"
+
+#: g10/gpg.c:562 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:568
+msgid "|N|set compress level to N (0 disables)"
+msgstr "|N|set compress level to N (0 disables)"
+
+#: g10/gpg.c:575
+msgid "use canonical text mode"
+msgstr "use canonical text mode"
+
+#: g10/gpg.c:592 g10/gpgv.c:80 sm/gpgsm.c:303
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|write output to FILE"
+
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
+msgid "do not make any changes"
+msgstr "do not make any changes"
+
+#: g10/gpg.c:608
+msgid "prompt before overwriting"
+msgstr "prompt before overwriting"
+
+#: g10/gpg.c:658
+msgid "use strict OpenPGP behavior"
+msgstr "use strict OpenPGP behavior"
+
+#: g10/gpg.c:684 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:687
+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:1059
+msgid "Usage: @GPG@ [options] [files] (-h for help)"
+msgstr "Usage: @GPG@ [options] [files] (-h for help)"
+
+#: g10/gpg.c:1062
+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:1073 sm/gpgsm.c:581
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Supported algorithms:\n"
+
+#: g10/gpg.c:1076
+msgid "Pubkey: "
+msgstr "Pubkey: "
+
+#: g10/gpg.c:1083 g10/keyedit.c:3042
+msgid "Cipher: "
+msgstr "Cipher: "
+
+#: g10/gpg.c:1090
+msgid "Hash: "
+msgstr "Hash: "
+
+#: g10/gpg.c:1097 g10/keyedit.c:3091
+msgid "Compression: "
+msgstr "Compression: "
+
+#: g10/gpg.c:1166 sm/gpgsm.c:655
+#, c-format
+msgid "usage: %s [options] %s\n"
+msgstr "usage: %s [options] %s\n"
+
+#: g10/gpg.c:1354 sm/gpgsm.c:744
+msgid "conflicting commands\n"
+msgstr "conflicting commands\n"
+
+#: g10/gpg.c:1372
+#, 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:1570
+#, c-format
+msgid "WARNING: unsafe ownership on homedir '%s'\n"
+msgstr "WARNING: unsafe ownership on homedir ‘[1m%s[0m’\n"
+
+#: g10/gpg.c:1573
+#, 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:1576
+#, c-format
+msgid "WARNING: unsafe ownership on extension '%s'\n"
+msgstr "WARNING: unsafe ownership on extension ‘[1m%s[0m’\n"
+
+#: g10/gpg.c:1582
+#, c-format
+msgid "WARNING: unsafe permissions on homedir '%s'\n"
+msgstr "WARNING: unsafe permissions on homedir ‘[1m%s[0m’\n"
+
+#: g10/gpg.c:1585
+#, 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:1588
+#, c-format
+msgid "WARNING: unsafe permissions on extension '%s'\n"
+msgstr "WARNING: unsafe permissions on extension ‘[1m%s[0m’\n"
+
+#: g10/gpg.c:1594
+#, 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:1597
+#, 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:1600
+#, 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:1606
+#, 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:1609
+#, 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:1612
+#, 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:1828
+#, c-format
+msgid "unknown configuration item '%s'\n"
+msgstr "unknown configuration item ‘[1m%s[0m’\n"
+
+#: g10/gpg.c:1943
+msgid "display photo IDs during key listings"
+msgstr "display photo IDs during key listings"
+
+#: g10/gpg.c:1945
+msgid "show key usage information during key listings"
+msgstr "show key usage information during key listings"
+
+#: g10/gpg.c:1947
+msgid "show policy URLs during signature listings"
+msgstr "show policy URLs during signature listings"
+
+#: g10/gpg.c:1949
+msgid "show all notations during signature listings"
+msgstr "show all notations during signature listings"
+
+#: g10/gpg.c:1951
+msgid "show IETF standard notations during signature listings"
+msgstr "show IETF standard notations during signature listings"
+
+#: g10/gpg.c:1955
+msgid "show user-supplied notations during signature listings"
+msgstr "show user-supplied notations during signature listings"
+
+#: g10/gpg.c:1957
+msgid "show preferred keyserver URLs during signature listings"
+msgstr "show preferred keyserver URLs during signature listings"
+
+#: g10/gpg.c:1959
+msgid "show user ID validity during key listings"
+msgstr "show user ID validity during key listings"
+
+#: g10/gpg.c:1961
+msgid "show revoked and expired user IDs in key listings"
+msgstr "show revoked and expired user IDs in key listings"
+
+#: g10/gpg.c:1963
+msgid "show revoked and expired subkeys in key listings"
+msgstr "show revoked and expired subkeys in key listings"
+
+#: g10/gpg.c:1965
+msgid "show the keyring name in key listings"
+msgstr "show the keyring name in key listings"
+
+#: g10/gpg.c:1967
+msgid "show expiration dates during signature listings"
+msgstr "show expiration dates during signature listings"
+
+#: g10/gpg.c:2080
+#, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "unknown TOFU policy ‘[1m%s[0m’\n"
+
+#: g10/gpg.c:2082
+msgid "(use \"help\" to list choices)\n"
+msgstr "(use “[1mhelp[0m” to list choices)\n"
+
+#: g10/gpg.c:2233
+#, 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:2850 g10/gpg.c:3656 g10/gpg.c:3668
+#, c-format
+msgid "Note: %s is not for normal use!\n"
+msgstr "Note: %s is not for normal use!\n"
+
+#: g10/gpg.c:3030 g10/gpg.c:3042
+#, 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:3064
+#, 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:3096 sm/gpgsm.c:1162
+#, c-format
+msgid "invalid pinentry mode '%s'\n"
+msgstr "invalid pinentry mode ‘[1m%s[0m’\n"
+
+#: g10/gpg.c:3151
+#, 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:3173 g10/gpg.c:3379 g10/keyedit.c:5008
+msgid "could not parse keyserver URL\n"
+msgstr "could not parse keyserver URL\n"
+
+#: g10/gpg.c:3191
+#, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: invalid keyserver options\n"
+
+#: g10/gpg.c:3194
+msgid "invalid keyserver options\n"
+msgstr "invalid keyserver options\n"
+
+#: g10/gpg.c:3201
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: invalid import options\n"
+
+#: g10/gpg.c:3204
+msgid "invalid import options\n"
+msgstr "invalid import options\n"
+
+#: g10/gpg.c:3210 g10/gpg.c:3225
+#, c-format
+msgid "invalid filter option: %s\n"
+msgstr "invalid filter option: %s\n"
+
+#: g10/gpg.c:3216
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: invalid export options\n"
+
+#: g10/gpg.c:3219
+msgid "invalid export options\n"
+msgstr "invalid export options\n"
+
+#: g10/gpg.c:3231
+#, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: invalid list options\n"
+
+#: g10/gpg.c:3234
+msgid "invalid list options\n"
+msgstr "invalid list options\n"
+
+#: g10/gpg.c:3242
+msgid "display photo IDs during signature verification"
+msgstr "display photo IDs during signature verification"
+
+#: g10/gpg.c:3244
+msgid "show policy URLs during signature verification"
+msgstr "show policy URLs during signature verification"
+
+#: g10/gpg.c:3246
+msgid "show all notations during signature verification"
+msgstr "show all notations during signature verification"
+
+#: g10/gpg.c:3248
+msgid "show IETF standard notations during signature verification"
+msgstr "show IETF standard notations during signature verification"
+
+#: g10/gpg.c:3252
+msgid "show user-supplied notations during signature verification"
+msgstr "show user-supplied notations during signature verification"
+
+#: g10/gpg.c:3254
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "show preferred keyserver URLs during signature verification"
+
+#: g10/gpg.c:3256
+msgid "show user ID validity during signature verification"
+msgstr "show user ID validity during signature verification"
+
+#: g10/gpg.c:3258
+msgid "show revoked and expired user IDs in signature verification"
+msgstr "show revoked and expired user IDs in signature verification"
+
+#: g10/gpg.c:3260
+msgid "show only the primary user ID in signature verification"
+msgstr "show only the primary user ID in signature verification"
+
+#: g10/gpg.c:3262
+msgid "validate signatures with PKA data"
+msgstr "validate signatures with PKA data"
+
+#: g10/gpg.c:3264
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr "elevate the trust of signatures with valid PKA data"
+
+#: g10/gpg.c:3271
+#, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: invalid verify options\n"
+
+#: g10/gpg.c:3274
+msgid "invalid verify options\n"
+msgstr "invalid verify options\n"
+
+#: g10/gpg.c:3281
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "unable to set exec-path to %s\n"
+
+#: g10/gpg.c:3482
+#, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: invalid auto-key-locate list\n"
+
+#: g10/gpg.c:3485
+msgid "invalid auto-key-locate list\n"
+msgstr "invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
+msgid "WARNING: program may create a core file!\n"
+msgstr "WARNING: program may create a core file!\n"
+
+#: g10/gpg.c:3649
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "WARNING: %s overrides %s\n"
+
+#: g10/gpg.c:3658
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s not allowed with %s!\n"
+
+#: g10/gpg.c:3661
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s makes no sense with %s!\n"
+
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
+msgid "WARNING: running with faked system time: "
+msgstr "WARNING: running with faked system time: "
+
+#: g10/gpg.c:3697
+#, 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:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
+msgid "selected cipher algorithm is invalid\n"
+msgstr "selected cipher algorithm is invalid\n"
+
+#: g10/gpg.c:3744
+msgid "selected compression algorithm is invalid\n"
+msgstr "selected compression algorithm is invalid\n"
+
+#: g10/gpg.c:3750
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "selected certification digest algorithm is invalid\n"
+
+#: g10/gpg.c:3765
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed must be greater than 0\n"
+
+#: g10/gpg.c:3767
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed must be greater than 1\n"
+
+#: g10/gpg.c:3769
+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:3771
+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:3773
+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:3776
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
+msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
+
+#: g10/gpg.c:3780
+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:3787
+msgid "invalid default preferences\n"
+msgstr "invalid default preferences\n"
+
+#: g10/gpg.c:3791
+msgid "invalid personal cipher preferences\n"
+msgstr "invalid personal cipher preferences\n"
+
+#: g10/gpg.c:3795
+msgid "invalid personal digest preferences\n"
+msgstr "invalid personal digest preferences\n"
+
+#: g10/gpg.c:3799
+msgid "invalid personal compress preferences\n"
+msgstr "invalid personal compress preferences\n"
+
+#: g10/gpg.c:3835
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s does not yet work with %s\n"
+
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 sm/sign.c:478 sm/verify.c:473
+#, c-format
+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:3894
+#, c-format
+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:4034
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "failed to initialize the TrustDB: %s\n"
+
+#: g10/gpg.c:4046
+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:4118
+#, c-format
+msgid "symmetric encryption of '%s' failed: %s\n"
+msgstr "symmetric encryption of ‘[1m%s[0m’ failed: %s\n"
+
+#: g10/gpg.c:4147
+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:4150
+#, c-format
+msgid "you cannot use --symmetric --encrypt in %s mode\n"
+msgstr "you cannot use --symmetric --encrypt in %s mode\n"
+
+#: g10/gpg.c:4208
+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:4211
+#, c-format
+msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
+msgstr "you cannot use --symmetric --sign --encrypt in %s mode\n"
+
+#: g10/gpg.c:4568 g10/keyserver.c:1846
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "keyserver send failed: %s\n"
+
+#: g10/gpg.c:4573
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "keyserver receive failed: %s\n"
+
+#: g10/gpg.c:4579
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "key export failed: %s\n"
+
+#: g10/gpg.c:4592
+#, c-format
+msgid "export as ssh key failed: %s\n"
+msgstr "export as ssh key failed: %s\n"
+
+#: g10/gpg.c:4604
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "keyserver search failed: %s\n"
+
+#: g10/gpg.c:4617
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "keyserver refresh failed: %s\n"
+
+#: g10/gpg.c:4684
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "dearmoring failed: %s\n"
+
+#: g10/gpg.c:4695
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "enarmoring failed: %s\n"
+
+#: g10/gpg.c:4787
+#, c-format
+msgid "invalid hash algorithm '%s'\n"
+msgstr "invalid hash algorithm ‘[1m%s[0m’\n"
+
+#: g10/gpg.c:4936 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:4948
+#, 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:4996
+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:5007
+msgid "Go ahead and type your message ...\n"
+msgstr "Go ahead and type your message ...\n"
+
+#: g10/gpg.c:5346
+msgid "the given certification policy URL is invalid\n"
+msgstr "the given certification policy URL is invalid\n"
+
+#: g10/gpg.c:5348
+msgid "the given signature policy URL is invalid\n"
+msgstr "the given signature policy URL is invalid\n"
+
+#: g10/gpg.c:5381
+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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
+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:160
+msgid "import signatures that are marked as local-only"
+msgstr "import signatures that are marked as local-only"
+
+#: 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:166
+msgid "do not clear the ownertrust values during import"
+msgstr "do not clear the ownertrust values during import"
+
+#: g10/import.c:169
+msgid "do not update the trustdb after import"
+msgstr "do not update the trustdb after import"
+
+#: g10/import.c:172
+msgid "show key during import"
+msgstr "show key during import"
+
+#: g10/import.c:175
+msgid "only accept updates to existing keys"
+msgstr "only accept updates to existing keys"
+
+#: g10/import.c:178
+msgid "remove unusable parts from key after import"
+msgstr "remove unusable parts from key after import"
+
+#: 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:184
+msgid "run import filters and export key immediately"
+msgstr "run import filters and export key immediately"
+
+#: g10/import.c:187
+msgid "assume the GnuPG key backup format"
+msgstr "assume the GnuPG key backup format"
+
+#: g10/import.c:191
+msgid "repair keys on import"
+msgstr "repair keys on import"
+
+#: g10/import.c:356 g10/import.c:594
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "skipping block of type %d\n"
+
+#: g10/import.c:611
+#, c-format
+msgid "%lu keys processed so far\n"
+msgstr "%lu keys processed so far\n"
+
+#: g10/import.c:681
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Total number processed: %lu\n"
+
+#: g10/import.c:684
+#, c-format
+msgid " skipped PGP-2 keys: %lu\n"
+msgstr " skipped PGP-2 keys: %lu\n"
+
+#: g10/import.c:686
+#, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " skipped new keys: %lu\n"
+
+#: g10/import.c:689
+#, c-format
+msgid " w/o user IDs: %lu\n"
+msgstr " w/o user IDs: %lu\n"
+
+#: g10/import.c:692 sm/import.c:130
+#, c-format
+msgid " imported: %lu"
+msgstr " imported: %lu"
+
+#: g10/import.c:696 sm/import.c:134
+#, c-format
+msgid " unchanged: %lu\n"
+msgstr " unchanged: %lu\n"
+
+#: g10/import.c:698
+#, c-format
+msgid " new user IDs: %lu\n"
+msgstr " new user IDs: %lu\n"
+
+#: g10/import.c:700
+#, c-format
+msgid " new subkeys: %lu\n"
+msgstr " new subkeys: %lu\n"
+
+#: g10/import.c:702
+#, c-format
+msgid " new signatures: %lu\n"
+msgstr " new signatures: %lu\n"
+
+#: g10/import.c:704
+#, c-format
+msgid " new key revocations: %lu\n"
+msgstr " new key revocations: %lu\n"
+
+#: g10/import.c:706 sm/import.c:136
+#, c-format
+msgid " secret keys read: %lu\n"
+msgstr " secret keys read: %lu\n"
+
+#: g10/import.c:708 sm/import.c:138
+#, c-format
+msgid " secret keys imported: %lu\n"
+msgstr " secret keys imported: %lu\n"
+
+#: g10/import.c:710 sm/import.c:140
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr " secret keys unchanged: %lu\n"
+
+#: g10/import.c:712 sm/import.c:142
+#, c-format
+msgid " not imported: %lu\n"
+msgstr " not imported: %lu\n"
+
+#: g10/import.c:714
+#, c-format
+msgid " signatures cleaned: %lu\n"
+msgstr " signatures cleaned: %lu\n"
+
+#: g10/import.c:716
+#, c-format
+msgid " user IDs cleaned: %lu\n"
+msgstr " user IDs cleaned: %lu\n"
+
+#: g10/import.c:1069
+#, 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:1111
+#, c-format
+msgid " \"%s\": preference for cipher algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for cipher algorithm %s\n"
+
+#: g10/import.c:1126
+#, c-format
+msgid " \"%s\": preference for digest algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for digest algorithm %s\n"
+
+#: g10/import.c:1138
+#, c-format
+msgid " \"%s\": preference for compression algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for compression algorithm %s\n"
+
+#: g10/import.c:1151
+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:1153
+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:1178
+#, 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:1665 g10/import.c:2477
+#, c-format
+msgid "key %s: no user ID\n"
+msgstr "key %s: no user ID\n"
+
+#: g10/import.c:1671
+#, c-format
+msgid "key %s: %s\n"
+msgstr "key %s: %s\n"
+
+#: g10/import.c:1672 g10/import.c:2451
+msgid "rejected by import screener"
+msgstr "rejected by import screener"
+
+#: g10/import.c:1704
+#, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "key %s: PKS subkey corruption repaired\n"
+
+#: g10/import.c:1725
+#, 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:1735 g10/import.c:1766
+#, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "key %s: no valid user IDs\n"
+
+#: g10/import.c:1737
+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:1812 g10/import.c:2629
+#, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "key %s: public key not found: %s\n"
+
+#: g10/import.c:1818
+#, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "key %s: new key - skipped\n"
+
+#: g10/import.c:1830
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "no writable keyring found: %s\n"
+
+#: g10/import.c:1857 g10/import.c:1947 g10/import.c:2695
+#, c-format
+msgid "error writing keyring '%s': %s\n"
+msgstr "error writing keyring '%s': %s\n"
+
+#: g10/import.c:1880
+#, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "key %s: public key “[1m%s[0m” imported\n"
+
+#: g10/import.c:1904
+#, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "key %s: doesn't match our copy\n"
+
+#: g10/import.c:1961
+#, 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:1964
+#, 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:1967
+#, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "key %s: “[1m%s[0m” 1 new signature\n"
+
+#: g10/import.c:1970
+#, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "key %s: “[1m%s[0m” %d new signatures\n"
+
+#: g10/import.c:1973
+#, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "key %s: “[1m%s[0m” 1 new subkey\n"
+
+#: g10/import.c:1976
+#, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "key %s: “[1m%s[0m” %d new subkeys\n"
+
+#: g10/import.c:1979
+#, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "key %s: “[1m%s[0m” %d signature cleaned\n"
+
+#: g10/import.c:1982
+#, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "key %s: “[1m%s[0m” %d signatures cleaned\n"
+
+#: g10/import.c:1985
+#, 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:1988
+#, 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:2018
+#, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "key %s: “[1m%s[0m” not changed\n"
+
+#: g10/import.c:2329 g10/import.c:2575
+#, c-format
+msgid "key %s: secret key imported\n"
+msgstr "key %s: secret key imported\n"
+
+#: g10/import.c:2337
+#, c-format
+msgid "key %s: secret key already exists\n"
+msgstr "key %s: secret key already exists\n"
+
+#: g10/import.c:2345
+#, c-format
+msgid "key %s: error sending to agent: %s\n"
+msgstr "key %s: error sending to agent: %s\n"
+
+#: g10/import.c:2450
+#, c-format
+msgid "secret key %s: %s\n"
+msgstr "secret key %s: %s\n"
+
+#: g10/import.c:2470 g10/import.c:2505
+msgid "importing secret keys not allowed\n"
+msgstr "importing secret keys not allowed\n"
+
+#: g10/import.c:2494
+#, 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:2567
+#, 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:2622
+#, 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:2653
+#, 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:2660
+#, 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:2671
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "key %s: invalid revocation certificate: %s - rejected\n"
+
+#: g10/import.c:2704
+#, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "key %s: “[1m%s[0m” revocation certificate imported\n"
+
+#: g10/import.c:2780
+#, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "key %s: no user ID for signature\n"
+
+#: g10/import.c:2797
+#, 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:2799
+#, 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:2816 g10/import.c:2842 g10/import.c:2893
+#, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "key %s: unsupported public key algorithm\n"
+
+#: g10/import.c:2817
+#, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "key %s: invalid direct key signature\n"
+
+#: g10/import.c:2831
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "key %s: no subkey for key binding\n"
+
+#: g10/import.c:2844
+#, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "key %s: invalid subkey binding\n"
+
+#: g10/import.c:2860
+#, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "key %s: removed multiple subkey binding\n"
+
+#: g10/import.c:2882
+#, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "key %s: no subkey for key revocation\n"
+
+#: g10/import.c:2895
+#, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "key %s: invalid subkey revocation\n"
+
+#: g10/import.c:2910
+#, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "key %s: removed multiple subkey revocation\n"
+
+#: g10/import.c:2953
+#, c-format
+msgid "key %s: skipped user ID \"%s\"\n"
+msgstr "key %s: skipped user ID “[1m%s[0m”\n"
+
+#: g10/import.c:2977
+#, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "key %s: skipped subkey\n"
+
+#: g10/import.c:3006
+#, 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:3017
+#, 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:3035
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "key %s: invalid revocation certificate: %s - skipped\n"
+
+#: g10/import.c:3049
+#, 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:3057
+#, 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:3199
+#, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "key %s: duplicated user ID detected - merged\n"
+
+#: g10/import.c:3264
+#, 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:3280
+#, 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:3346
+#, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "key %s: “[1m%s[0m” revocation certificate added\n"
+
+#: g10/import.c:3384
+#, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "key %s: direct key signature added\n"
+
+#: g10/keydb.c:429 g10/keydb.c:456 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:432 g10/keydb.c:459
+#, c-format
+msgid "error creating keyring '%s': %s\n"
+msgstr "error creating keyring '%s': %s\n"
+
+#: g10/keydb.c:468 sm/keydb.c:232
+#, c-format
+msgid "keybox '%s' created\n"
+msgstr "keybox ‘[1m%s[0m’ created\n"
+
+#: g10/keydb.c:470
+#, c-format
+msgid "keyring '%s' created\n"
+msgstr "keyring ‘[1m%s[0m’ created\n"
+
+#: g10/keydb.c:848
+#, c-format
+msgid "keyblock resource '%s': %s\n"
+msgstr "keyblock resource '%s': %s\n"
+
+#: g10/keydb.c:954
+#, c-format
+msgid "error opening key DB: %s\n"
+msgstr "error opening key DB: %s\n"
+
+#: g10/keydb.c:1773
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "failed to rebuild keyring cache: %s\n"
+
+#: g10/keyedit.c:260
+msgid "[revocation]"
+msgstr "[revocation]"
+
+#: g10/keyedit.c:260
+msgid "[self-signature]"
+msgstr "[self-signature]"
+
+#: 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:387 g10/pkclist.c:286
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = I trust marginally\n"
+
+#: 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: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: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: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:559
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "User ID “[1m%s[0m” is revoked."
+
+#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
+#: g10/keyedit.c:1651
+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:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
+#: g10/keyedit.c:1656 g10/keyedit.c:2662
+msgid " Unable to sign.\n"
+msgstr " Unable to sign.\n"
+
+#: g10/keyedit.c:587
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "User ID “[1m%s[0m” is expired."
+
+#: 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:644
+#, c-format
+msgid "User ID \"%s\" is signable. "
+msgstr "User ID “[1m%s[0m” is signable. "
+
+#: g10/keyedit.c:646
+msgid "Sign it? (y/N) "
+msgstr "Sign it? (y/N) "
+
+#: 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: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: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: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: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: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: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: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: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:777
+#, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Nothing to sign with key %s\n"
+
+#: g10/keyedit.c:801
+msgid "This key has expired!"
+msgstr "This key has expired!"
+
+#: 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: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: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:871
+#, c-format
+msgid " (0) I will not answer.%s\n"
+msgstr " (0) I will not answer.%s\n"
+
+#: 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:875
+#, c-format
+msgid " (2) I have done casual checking.%s\n"
+msgstr " (2) I have done casual checking.%s\n"
+
+#: 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:885
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Your selection? (enter ‘[1m?[0m’ for more information): "
+
+#: 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:920
+msgid "This will be a self-signature.\n"
+msgstr "This will be a self-signature.\n"
+
+#: 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: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:942
+msgid "The signature will be marked as non-exportable.\n"
+msgstr "The signature will be marked as non-exportable.\n"
+
+#: 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:956
+msgid "I have not checked this key at all.\n"
+msgstr "I have not checked this key at all.\n"
+
+#: g10/keyedit.c:961
+msgid "I have checked this key casually.\n"
+msgstr "I have checked this key casually.\n"
+
+#: 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:978
+msgid "Really sign? (y/N) "
+msgstr "Really sign? (y/N) "
+
+#: g10/keyedit.c:1029 g10/keyedit.c:5881 g10/keyedit.c:5964 g10/keyedit.c:6093
+#: g10/keyedit.c:6155 g10/sign.c:357
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "signing failed: %s\n"
+
+#: 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:1146
+#, c-format
+msgid "key %s: error changing passphrase: %s\n"
+msgstr "key %s: error changing passphrase: %s\n"
+
+#: g10/keyedit.c:1258
+msgid "save and quit"
+msgstr "save and quit"
+
+#: g10/keyedit.c:1261
+msgid "show key fingerprint"
+msgstr "show key fingerprint"
+
+#: g10/keyedit.c:1262
+msgid "show the keygrip"
+msgstr "show the keygrip"
+
+#: g10/keyedit.c:1263
+msgid "list key and user IDs"
+msgstr "list key and user IDs"
+
+#: g10/keyedit.c:1265
+msgid "select user ID N"
+msgstr "select user ID N"
+
+#: g10/keyedit.c:1266
+msgid "select subkey N"
+msgstr "select subkey N"
+
+#: g10/keyedit.c:1267
+msgid "check signatures"
+msgstr "check signatures"
+
+#: g10/keyedit.c:1273
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr "sign selected user IDs [* see below for related commands]"
+
+#: g10/keyedit.c:1278
+msgid "sign selected user IDs locally"
+msgstr "sign selected user IDs locally"
+
+#: g10/keyedit.c:1279
+msgid "sign selected user IDs with a trust signature"
+msgstr "sign selected user IDs with a trust signature"
+
+#: g10/keyedit.c:1281
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr "sign selected user IDs with a non-revocable signature"
+
+#: g10/keyedit.c:1283
+msgid "add a user ID"
+msgstr "add a user ID"
+
+#: g10/keyedit.c:1285
+msgid "add a photo ID"
+msgstr "add a photo ID"
+
+#: g10/keyedit.c:1286
+msgid "delete selected user IDs"
+msgstr "delete selected user IDs"
+
+#: g10/keyedit.c:1289
+msgid "add a subkey"
+msgstr "add a subkey"
+
+#: g10/keyedit.c:1292
+msgid "add a key to a smartcard"
+msgstr "add a key to a smartcard"
+
+#: g10/keyedit.c:1294
+msgid "move a key to a smartcard"
+msgstr "move a key to a smartcard"
+
+#: g10/keyedit.c:1296
+msgid "move a backup key to a smartcard"
+msgstr "move a backup key to a smartcard"
+
+#: g10/keyedit.c:1298
+msgid "delete selected subkeys"
+msgstr "delete selected subkeys"
+
+#: g10/keyedit.c:1300
+msgid "add a revocation key"
+msgstr "add a revocation key"
+
+#: g10/keyedit.c:1302
+msgid "delete signatures from the selected user IDs"
+msgstr "delete signatures from the selected user IDs"
+
+#: g10/keyedit.c:1304
+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:1306
+msgid "flag the selected user ID as primary"
+msgstr "flag the selected user ID as primary"
+
+#: g10/keyedit.c:1309
+msgid "list preferences (expert)"
+msgstr "list preferences (expert)"
+
+#: g10/keyedit.c:1310
+msgid "list preferences (verbose)"
+msgstr "list preferences (verbose)"
+
+#: g10/keyedit.c:1312
+msgid "set preference list for the selected user IDs"
+msgstr "set preference list for the selected user IDs"
+
+#: g10/keyedit.c:1315
+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:1317
+msgid "set a notation for the selected user IDs"
+msgstr "set a notation for the selected user IDs"
+
+#: g10/keyedit.c:1319
+msgid "change the passphrase"
+msgstr "change the passphrase"
+
+#: g10/keyedit.c:1322
+msgid "change the ownertrust"
+msgstr "change the ownertrust"
+
+#: g10/keyedit.c:1325
+msgid "revoke signatures on the selected user IDs"
+msgstr "revoke signatures on the selected user IDs"
+
+#: g10/keyedit.c:1327
+msgid "revoke selected user IDs"
+msgstr "revoke selected user IDs"
+
+#: g10/keyedit.c:1330
+msgid "revoke key or selected subkeys"
+msgstr "revoke key or selected subkeys"
+
+#: g10/keyedit.c:1332
+msgid "enable key"
+msgstr "enable key"
+
+#: g10/keyedit.c:1333
+msgid "disable key"
+msgstr "disable key"
+
+#: g10/keyedit.c:1335
+msgid "show selected photo IDs"
+msgstr "show selected photo IDs"
+
+#: g10/keyedit.c:1337
+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:1339
+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:1459
+msgid "Secret key is available.\n"
+msgstr "Secret key is available.\n"
+
+#: g10/keyedit.c:1461
+msgid "Secret subkeys are available.\n"
+msgstr "Secret subkeys are available.\n"
+
+#: g10/keyedit.c:1563
+msgid "Need the secret key to do this.\n"
+msgstr "Need the secret key to do this.\n"
+
+#: g10/keyedit.c:1586
+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:1644 g10/keyedit.c:2662 g10/keyedit.c:2801 g10/keyedit.c:2869
+msgid "Key is revoked."
+msgstr "Key is revoked."
+
+#: g10/keyedit.c:1667
+msgid "Really sign all user IDs? (y/N) "
+msgstr "Really sign all user IDs? (y/N) "
+
+#: g10/keyedit.c:1671
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Really sign all text user IDs? (y/N) "
+
+#: g10/keyedit.c:1679
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Hint: Select the user IDs to sign\n"
+
+#: g10/keyedit.c:1690
+#, c-format
+msgid "Unknown signature type '%s'\n"
+msgstr "Unknown signature type ‘[1m%s[0m’\n"
+
+#: g10/keyedit.c:1714
+#, 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:1736 g10/keyedit.c:1760 g10/keyedit.c:1957
+msgid "You must select at least one user ID.\n"
+msgstr "You must select at least one user ID.\n"
+
+#: g10/keyedit.c:1738 g10/keyedit.c:1762 g10/keyedit.c:1919 g10/keyedit.c:1959
+#, c-format
+msgid "(Use the '%s' command.)\n"
+msgstr "(Use the ‘[1m%s[0m’ command.)\n"
+
+#: g10/keyedit.c:1741
+msgid "You can't delete the last user ID!\n"
+msgstr "You can't delete the last user ID!\n"
+
+#: g10/keyedit.c:1744
+msgid "Really remove all selected user IDs? (y/N) "
+msgstr "Really remove all selected user IDs? (y/N) "
+
+#: g10/keyedit.c:1745
+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:1802
+msgid "Really move the primary key? (y/N) "
+msgstr "Really move the primary key? (y/N) "
+
+#: g10/keyedit.c:1814 g10/keyedit.c:4532
+msgid "You must select exactly one key.\n"
+msgstr "You must select exactly one key.\n"
+
+#: g10/keyedit.c:1842
+msgid "Command expects a filename argument\n"
+msgstr "Command expects a filename argument\n"
+
+#: g10/keyedit.c:1863
+#, c-format
+msgid "Can't open '%s': %s\n"
+msgstr "Can't open '%s': %s\n"
+
+#: g10/keyedit.c:1882
+#, c-format
+msgid "Error reading backup key from '%s': %s\n"
+msgstr "Error reading backup key from '%s': %s\n"
+
+#: g10/keyedit.c:1917
+msgid "You must select at least one key.\n"
+msgstr "You must select at least one key.\n"
+
+#: g10/keyedit.c:1923
+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:1925
+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:1963
+msgid "Really revoke all selected user IDs? (y/N) "
+msgstr "Really revoke all selected user IDs? (y/N) "
+
+#: g10/keyedit.c:1964
+msgid "Really revoke this user ID? (y/N) "
+msgstr "Really revoke this user ID? (y/N) "
+
+#: g10/keyedit.c:1982
+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:1993
+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:1995
+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:2053
+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:2098
+msgid "Set preference list to:\n"
+msgstr "Set preference list to:\n"
+
+#: g10/keyedit.c:2105
+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:2107
+msgid "Really update the preferences? (y/N) "
+msgstr "Really update the preferences? (y/N) "
+
+#: g10/keyedit.c:2181
+msgid "Save changes? (y/N) "
+msgstr "Save changes? (y/N) "
+
+#: g10/keyedit.c:2185
+msgid "Quit without saving? (y/N) "
+msgstr "Quit without saving? (y/N) "
+
+#: g10/keyedit.c:2196 g10/keyedit.c:2206 g10/keyedit.c:2383 g10/keyedit.c:2457
+#: g10/keyedit.c:2528 g10/keyedit.c:2752 g10/keyedit.c:2817 g10/keyedit.c:2968
+#, c-format
+msgid "update failed: %s\n"
+msgstr "update failed: %s\n"
+
+#: g10/keyedit.c:2212 g10/keyedit.c:2757 g10/keyedit.c:2822 g10/keyedit.c:2975
+msgid "Key not changed so no update needed.\n"
+msgstr "Key not changed so no update needed.\n"
+
+#: g10/keyedit.c:2444
+msgid "cannot revoke the last valid user ID.\n"
+msgstr "cannot revoke the last valid user ID.\n"
+
+#: g10/keyedit.c:2471
+#, c-format
+msgid "revoking the user ID failed: %s\n"
+msgstr "revoking the user ID failed: %s\n"
+
+#: g10/keyedit.c:2537
+#, c-format
+msgid "setting the primary user ID failed: %s\n"
+msgstr "setting the primary user ID failed: %s\n"
+
+#: g10/keyedit.c:2568
+#, c-format
+msgid "\"%s\" is not a fingerprint\n"
+msgstr "“[1m%s[0m” is not a fingerprint\n"
+
+#: g10/keyedit.c:2597
+#, c-format
+msgid "\"%s\" is not the primary fingerprint\n"
+msgstr "“[1m%s[0m” is not the primary fingerprint\n"
+
+#: g10/keyedit.c:2733 g10/keyedit.c:2736
+#, c-format
+msgid "Invalid user ID '%s': %s\n"
+msgstr "Invalid user ID '%s': %s\n"
+
+#: g10/keyedit.c:2739
+msgid "No matching user IDs."
+msgstr "No matching user IDs."
+
+#: g10/keyedit.c:2739
+msgid "Nothing to sign.\n"
+msgstr "Nothing to sign.\n"
+
+#: g10/keyedit.c:2877
+#, 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:2920
+#, c-format
+msgid "\"%s\" is not a proper fingerprint\n"
+msgstr "“[1m%s[0m” is not a proper fingerprint\n"
+
+#: g10/keyedit.c:2944
+#, c-format
+msgid "subkey \"%s\" not found\n"
+msgstr "subkey “[1m%s[0m” not found\n"
+
+#: g10/keyedit.c:3067
+msgid "Digest: "
+msgstr "Digest: "
+
+#: g10/keyedit.c:3124
+msgid "Features: "
+msgstr "Features: "
+
+#: g10/keyedit.c:3135
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
+#: g10/keyedit.c:3150 g10/keylist.c:375
+msgid "Preferred keyserver: "
+msgstr "Preferred keyserver: "
+
+#: g10/keyedit.c:3158 g10/keyedit.c:3159
+msgid "Notations: "
+msgstr "Notations: "
+
+#: g10/keyedit.c:3404
+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:3476
+#, 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:3500
+#, 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:3506
+msgid "(sensitive)"
+msgstr "(sensitive)"
+
+#: g10/keyedit.c:3548 g10/keyedit.c:3690 g10/keylist.c:263 g10/keyserver.c:538
+#, c-format
+msgid "created: %s"
+msgstr "created: %s"
+
+#: g10/keyedit.c:3551 g10/keylist.c:1938
+#, c-format
+msgid "revoked: %s"
+msgstr "revoked: %s"
+
+#: g10/keyedit.c:3553 g10/keylist.c:1944
+#, c-format
+msgid "expired: %s"
+msgstr "expired: %s"
+
+#: g10/keyedit.c:3555 g10/keyedit.c:3692 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
+#, c-format
+msgid "expires: %s"
+msgstr "expires: %s"
+
+#: g10/keyedit.c:3557
+#, c-format
+msgid "usage: %s"
+msgstr "usage: %s"
+
+#: g10/keyedit.c:3565 g10/keyedit.c:3585 g10/keylist.c:268
+msgid "card-no: "
+msgstr "card-no: "
+
+#: g10/keyedit.c:3624
+#, c-format
+msgid "trust: %s"
+msgstr "trust: %s"
+
+#: g10/keyedit.c:3628
+#, c-format
+msgid "validity: %s"
+msgstr "validity: %s"
+
+#: g10/keyedit.c:3635
+msgid "This key has been disabled"
+msgstr "This key has been disabled"
+
+#: g10/keyedit.c:3653
+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:3709 g10/keyedit.c:4140 g10/keyserver.c:548
+#: g10/mainproc.c:2109 g10/tofu.c:1787 g10/trust.c:437 g10/trust.c:747
+#: dirmngr/ocsp.c:705
+msgid "revoked"
+msgstr "revoked"
+
+#: g10/keyedit.c:3711 g10/keyedit.c:4142 g10/keyserver.c:552
+#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:124 g10/trust.c:749
+msgid "expired"
+msgstr "expired"
+
+#: g10/keyedit.c:3828
+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:3880
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr "WARNING: Your encryption subkey expires soon.\n"
+
+#: g10/keyedit.c:3881
+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:3940
+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:3945 g10/keyedit.c:4235
+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:3951
+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:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
+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:4068
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Delete this good signature? (y/N/q)"
+
+#: g10/keyedit.c:4078
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Delete this invalid signature? (y/N/q)"
+
+#: g10/keyedit.c:4082
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Delete this unknown signature? (y/N/q)"
+
+#: g10/keyedit.c:4089
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Really delete this self-signature? (y/N)"
+
+#: g10/keyedit.c:4105
+#, 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:4109
+msgid "Nothing deleted.\n"
+msgstr "Nothing deleted.\n"
+
+#: g10/keyedit.c:4144 g10/trust.c:751
+msgid "invalid"
+msgstr "invalid"
+
+#: g10/keyedit.c:4146
+#, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID “[1m%s[0m” compacted: %s\n"
+
+#: g10/keyedit.c:4152
+#, 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:4160
+#, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID “[1m%s[0m”: already minimized\n"
+
+#: g10/keyedit.c:4161
+#, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "User ID “[1m%s[0m”: already clean\n"
+
+#: g10/keyedit.c:4230
+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:4241
+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:4258
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Enter the user ID of the designated revoker: "
+
+#: g10/keyedit.c:4283
+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:4298
+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:4320
+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:4338
+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:4344
+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:4412
+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:4417
+msgid "Changing expiration time for a subkey.\n"
+msgstr "Changing expiration time for a subkey.\n"
+
+#: g10/keyedit.c:4420
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Changing expiration time for the primary key.\n"
+
+#: g10/keyedit.c:4476
+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:4655
+#, c-format
+msgid "signing subkey %s is already cross-certified\n"
+msgstr "signing subkey %s is already cross-certified\n"
+
+#: g10/keyedit.c:4661
+#, 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:4778
+msgid "Please select exactly one user ID.\n"
+msgstr "Please select exactly one user ID.\n"
+
+#: g10/keyedit.c:4819 g10/keyedit.c:4933 g10/keyedit.c:5046 g10/keyedit.c:5184
+#, 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:4990
+msgid "Enter your preferred keyserver URL: "
+msgstr "Enter your preferred keyserver URL: "
+
+#: g10/keyedit.c:5069
+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:5070
+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:5130
+msgid "Enter the notation: "
+msgstr "Enter the notation: "
+
+#: g10/keyedit.c:5277
+msgid "Proceed? (y/N) "
+msgstr "Proceed? (y/N) "
+
+#: g10/keyedit.c:5347
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "No user ID with index %d\n"
+
+#: g10/keyedit.c:5409
+#, c-format
+msgid "No user ID with hash %s\n"
+msgstr "No user ID with hash %s\n"
+
+#: g10/keyedit.c:5510
+#, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "No subkey with key ID '%s'.\n"
+
+#: g10/keyedit.c:5532
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "No subkey with index %d\n"
+
+#: g10/keyedit.c:5673
+#, c-format
+msgid "user ID: \"%s\"\n"
+msgstr "user ID: “[1m%s[0m”\n"
+
+#: g10/keyedit.c:5676 g10/keyedit.c:5778 g10/keyedit.c:5826
+#, 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:5678 g10/keyedit.c:5780 g10/keyedit.c:5828
+msgid " (non-exportable)"
+msgstr " (non-exportable)"
+
+#: g10/keyedit.c:5682
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "This signature expired on %s.\n"
+
+#: g10/keyedit.c:5687
+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:5692
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Create a revocation certificate for this signature? (y/N) "
+
+#: g10/keyedit.c:5746
+msgid "Not signed by you.\n"
+msgstr "Not signed by you.\n"
+
+#: g10/keyedit.c:5752
+#, 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:5781
+msgid " (non-revocable)"
+msgstr " (non-revocable)"
+
+#: g10/keyedit.c:5788
+#, c-format
+msgid "revoked by your key %s on %s\n"
+msgstr "revoked by your key %s on %s\n"
+
+#: g10/keyedit.c:5813
+msgid "You are about to revoke these signatures:\n"
+msgstr "You are about to revoke these signatures:\n"
+
+#: g10/keyedit.c:5836
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Really create the revocation certificates? (y/N) "
+
+#: g10/keyedit.c:5869
+msgid "no secret key\n"
+msgstr "no secret key\n"
+
+#: g10/keyedit.c:5917
+#, 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:5927
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "user ID “[1m%s[0m” is already revoked\n"
+
+#: g10/keyedit.c:5944
+#, 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:6040
+msgid "Cannot revoke the last valid user ID.\n"
+msgstr "Cannot revoke the last valid user ID.\n"
+
+#: g10/keyedit.c:6078
+#, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Key %s is already revoked.\n"
+
+#: g10/keyedit.c:6140
+#, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Subkey %s is already revoked.\n"
+
+#: g10/keyedit.c:6237
+#, 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:169
+#, c-format
+msgid "invalid value for option '%s'\n"
+msgstr "invalid value for option ‘[1m%s[0m’\n"
+
+#: g10/keygen.c:318
+#, c-format
+msgid "preference '%s' duplicated\n"
+msgstr "preference ‘[1m%s[0m’ duplicated\n"
+
+#: g10/keygen.c:325
+msgid "too many cipher preferences\n"
+msgstr "too many cipher preferences\n"
+
+#: g10/keygen.c:327
+msgid "too many digest preferences\n"
+msgstr "too many digest preferences\n"
+
+#: g10/keygen.c:329
+msgid "too many compression preferences\n"
+msgstr "too many compression preferences\n"
+
- #: g10/keygen.c:472
++#: g10/keygen.c:489
+#, c-format
+msgid "invalid item '%s' in preference string\n"
+msgstr "invalid item ‘[1m%s[0m’ in preference string\n"
+
- #: g10/keygen.c:951
++#: g10/keygen.c:968
+msgid "writing direct signature\n"
+msgstr "writing direct signature\n"
+
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
+msgid "writing self signature\n"
+msgstr "writing self signature\n"
+
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
+msgid "writing key binding signature\n"
+msgstr "writing key binding signature\n"
+
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "keysize invalid; using %u bits\n"
+
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "keysize rounded up to %u bits\n"
+
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
+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:1695
++#: g10/keygen.c:1712
+msgid "Sign"
+msgstr "Sign"
+
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
+msgid "Certify"
+msgstr "Certify"
+
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
+msgid "Encrypt"
+msgstr "Encrypt"
+
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
+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:1723
++#: g10/keygen.c:1740
+msgid "SsEeAaQq"
+msgstr "SsEeAaQq"
+
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
+#, c-format
+msgid "Possible actions for a %s key: "
+msgstr "Possible actions for a %s key: "
+
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
+msgid "Current allowed actions: "
+msgstr "Current allowed actions: "
+
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
+#, c-format
+msgid " (%c) Toggle the sign capability\n"
+msgstr " (%c) Toggle the sign capability\n"
+
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
+#, c-format
+msgid " (%c) Toggle the encrypt capability\n"
+msgstr " (%c) Toggle the encrypt capability\n"
+
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
+#, c-format
+msgid " (%c) Toggle the authenticate capability\n"
+msgstr " (%c) Toggle the authenticate capability\n"
+
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
+#, c-format
+msgid " (%c) Finished\n"
+msgstr " (%c) Finished\n"
+
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 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:1887
++#: g10/keygen.c:1904
+#, c-format
+msgid " (%d) RSA and RSA (default)\n"
+msgstr " (%d) RSA and RSA (default)\n"
+
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
+#, c-format
+msgid " (%d) DSA and Elgamal\n"
+msgstr " (%d) DSA and Elgamal\n"
+
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
+#, c-format
+msgid " (%d) DSA (sign only)\n"
+msgstr " (%d) DSA (sign only)\n"
+
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
+#, c-format
+msgid " (%d) RSA (sign only)\n"
+msgstr " (%d) RSA (sign only)\n"
+
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
+#, c-format
+msgid " (%d) Elgamal (encrypt only)\n"
+msgstr " (%d) Elgamal (encrypt only)\n"
+
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
+#, c-format
+msgid " (%d) RSA (encrypt only)\n"
+msgstr " (%d) RSA (encrypt only)\n"
+
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
+#, c-format
+msgid " (%d) DSA (set your own capabilities)\n"
+msgstr " (%d) DSA (set your own capabilities)\n"
+
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
+#, c-format
+msgid " (%d) RSA (set your own capabilities)\n"
+msgstr " (%d) RSA (set your own capabilities)\n"
+
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
+#, c-format
+msgid " (%d) ECC and ECC\n"
+msgstr " (%d) ECC and ECC\n"
+
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
+#, c-format
+msgid " (%d) ECC (sign only)\n"
+msgstr " (%d) ECC (sign only)\n"
+
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
+#, c-format
+msgid " (%d) ECC (set your own capabilities)\n"
+msgstr " (%d) ECC (set your own capabilities)\n"
+
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
+#, c-format
+msgid " (%d) ECC (encrypt only)\n"
+msgstr " (%d) ECC (encrypt only)\n"
+
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
+#, c-format
+msgid " (%d) Existing key\n"
+msgstr " (%d) Existing key\n"
+
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
+msgid "Enter the keygrip: "
+msgstr "Enter the keygrip: "
+
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 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:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
+msgid "No key with this keygrip\n"
+msgstr "No key with this keygrip\n"
+
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
+#, c-format
+msgid "rounded to %u bits\n"
+msgstr "rounded to %u bits\n"
+
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
+#, 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:2186
++#: g10/keygen.c:2203
+#, 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:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
+#, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "What keysize do you want? (%u) "
+
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Requested keysize is %u bits\n"
+
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
+msgid "Please select which elliptic curve you want:\n"
+msgstr "Please select which elliptic curve you want:\n"
+
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
+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:2432
++#: g10/keygen.c:2449
+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:2455
++#: g10/keygen.c:2472
+msgid "Key is valid for? (0) "
+msgstr "Key is valid for? (0) "
+
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
+#, c-format
+msgid "Signature is valid for? (%s) "
+msgstr "Signature is valid for? (%s) "
+
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
+msgid "invalid value\n"
+msgstr "invalid value\n"
+
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
+msgid "Key does not expire at all\n"
+msgstr "Key does not expire at all\n"
+
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
+msgid "Signature does not expire at all\n"
+msgstr "Signature does not expire at all\n"
+
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
+#, c-format
+msgid "Key expires at %s\n"
+msgstr "Key expires at %s\n"
+
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
+#, c-format
+msgid "Signature expires at %s\n"
+msgstr "Signature expires at %s\n"
+
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
+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:2504
++#: g10/keygen.c:2521
+msgid "Is this correct? (y/N) "
+msgstr "Is this correct? (y/N) "
+
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
+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:2587
++#: g10/keygen.c:2604
+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:2606
++#: g10/keygen.c:2623
+msgid "Real name: "
+msgstr "Real name: "
+
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
+msgid "Invalid character in name\n"
+msgstr "Invalid character in name\n"
+
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
+#, 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:2620
++#: g10/keygen.c:2637
+msgid "Name may not start with a digit\n"
+msgstr "Name may not start with a digit\n"
+
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
+msgid "Name must be at least 5 characters long\n"
+msgstr "Name must be at least 5 characters long\n"
+
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
+msgid "Email address: "
+msgstr "Email address: "
+
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
+msgid "Not a valid email address\n"
+msgstr "Not a valid email address\n"
+
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
+msgid "Comment: "
+msgstr "Comment: "
+
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
+msgid "Invalid character in comment\n"
+msgstr "Invalid character in comment\n"
+
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
+#, 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:2696
++#: g10/keygen.c:2713
+#, 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:2701
++#: g10/keygen.c:2718
+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:2726
++#: g10/keygen.c:2743
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoQq"
+
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
+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:2737
++#: g10/keygen.c:2754
+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:2742
++#: g10/keygen.c:2759
+msgid "Change (N)ame, (E)mail, or (Q)uit? "
+msgstr "Change (N)ame, (E)mail, or (Q)uit? "
+
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
+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:2762
++#: g10/keygen.c:2779
+msgid "Please correct the error first\n"
+msgstr "Please correct the error first\n"
+
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
+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:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Key generation failed: %s\n"
+
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
+#, 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:3924
++#: g10/keygen.c:3941
+msgid "Continue? (Y/n) "
+msgstr "Continue? (Y/n) "
+
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
+#, c-format
+msgid "A key for \"%s\" already exists\n"
+msgstr "A key for “[1m%s[0m” already exists\n"
+
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
+msgid "Create anyway? (y/N) "
+msgstr "Create anyway? (y/N) "
+
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
+msgid "creating anyway\n"
+msgstr "creating anyway\n"
+
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
+#, 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:4387
++#: g10/keygen.c:4404
+msgid "Key generation canceled.\n"
+msgstr "Key generation canceled.\n"
+
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
+#, c-format
+msgid "can't create backup file '%s': %s\n"
+msgstr "can't create backup file '%s': %s\n"
+
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
+#, 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:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
+#, c-format
+msgid "writing public key to '%s'\n"
+msgstr "writing public key to ‘[1m%s[0m’\n"
+
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "no writable public keyring found: %s\n"
+
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
+#, c-format
+msgid "error writing public keyring '%s': %s\n"
+msgstr "error writing public keyring '%s': %s\n"
+
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
+msgid "public and secret key created and signed.\n"
+msgstr "public and secret key created and signed.\n"
+
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
+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:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
+#, 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:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
+#, 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:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
+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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Secret parts of primary key are not available.\n"
+
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
+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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
+msgid "Really create? (y/N) "
+msgstr "Really create? (y/N) "
+
+#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
+msgid "never "
+msgstr "never "
+
+#: g10/keylist.c:331
+msgid "Critical signature policy: "
+msgstr "Critical signature policy: "
+
+#: g10/keylist.c:333
+msgid "Signature policy: "
+msgstr "Signature policy: "
+
+#: g10/keylist.c:373
+msgid "Critical preferred keyserver: "
+msgstr "Critical preferred keyserver: "
+
+#: g10/keylist.c:426
+msgid "Critical signature notation: "
+msgstr "Critical signature notation: "
+
+#: g10/keylist.c:428
+msgid "Signature notation: "
+msgstr "Signature notation: "
+
+#: 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: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: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:591
+msgid "Keyring"
+msgstr "Keyring"
+
+#: g10/keylist.c:1805
+msgid "Primary key fingerprint:"
+msgstr "Primary key fingerprint:"
+
+#: 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:1815
+msgid " Primary key fingerprint:"
+msgstr " Primary key fingerprint:"
+
+#: g10/keylist.c:1817 g10/keylist.c:1827
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
+#: g10/keylist.c:1822 g10/keylist.c:1838
+msgid " Key fingerprint ="
+msgstr " Key fingerprint ="
+
+#: 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:1709
+#, c-format
+msgid "requesting key %s from %s server %s\n"
+msgstr "requesting key %s from %s server %s\n"
+
+#: g10/keyserver.c:1713
+#, c-format
+msgid "requesting key %s from %s\n"
+msgstr "requesting key %s from %s\n"
+
+#: g10/keyserver.c:1818 g10/keyserver.c:1996
+msgid "no keyserver known\n"
+msgstr "no keyserver known\n"
+
+#: 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:1836
+#, c-format
+msgid "sending key %s to %s\n"
+msgstr "sending key %s to %s\n"
+
+#: g10/keyserver.c:1877
+#, c-format
+msgid "requesting key from '%s'\n"
+msgstr "requesting key from ‘[1m%s[0m’\n"
+
+#: 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: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:303
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s encrypted session key\n"
+
+#: 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:379
+#, c-format
+msgid "public key is %s\n"
+msgstr "public key is %s\n"
+
+#: g10/mainproc.c:457
+msgid "public key encrypted data: good DEK\n"
+msgstr "public key encrypted data: good DEK\n"
+
+#: 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:494 g10/pkclist.c:228
+#, c-format
+msgid " \"%s\"\n"
+msgstr " “[1m%s[0m”\n"
+
+#: 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:515
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "public key decryption failed: %s\n"
+
+#: g10/mainproc.c:531
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "encrypted with %lu passphrases\n"
+
+#: g10/mainproc.c:533
+msgid "encrypted with 1 passphrase\n"
+msgstr "encrypted with 1 passphrase\n"
+
+#: 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: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:659 g10/mainproc.c:673
+msgid "WARNING: message was not integrity protected\n"
+msgstr "WARNING: message was not integrity protected\n"
+
+#: g10/mainproc.c:669
+msgid "decryption okay\n"
+msgstr "decryption okay\n"
+
+#: g10/mainproc.c:678
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "WARNING: encrypted message has been manipulated!\n"
+
+#: g10/mainproc.c:695
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "decryption failed: %s\n"
+
+#: 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:720
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "original file name='%.*s'\n"
+
+#: g10/mainproc.c:790
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr "WARNING: multiple plaintexts seen\n"
+
+#: 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:1265 g10/mainproc.c:1308
+msgid "no signature found\n"
+msgstr "no signature found\n"
+
+#: g10/mainproc.c:1642
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "BAD signature from “[1m%s[0m”"
+
+#: g10/mainproc.c:1644
+#, c-format
+msgid "Expired signature from \"%s\""
+msgstr "Expired signature from “[1m%s[0m”"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Good signature from “[1m%s[0m”"
+
+#: g10/mainproc.c:1666
+msgid "signature verification suppressed\n"
+msgstr "signature verification suppressed\n"
+
+#: 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:1789 g10/mainproc.c:1797
+#, c-format
+msgid "Signature made %s\n"
+msgstr "Signature made %s\n"
+
+#: 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: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:1808
+#, c-format
+msgid " issuer \"%s\"\n"
+msgstr " issuer “[1m%s[0m”\n"
+
+#: g10/mainproc.c:1825
+msgid "Key available at: "
+msgstr "Key available at: "
+
+#: g10/mainproc.c:2063
+msgid "[uncertain]"
+msgstr "[uncertain]"
+
+#: g10/mainproc.c:2101
+#, c-format
+msgid " aka \"%s\""
+msgstr " aka “[1m%s[0m”"
+
+#: 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:2198
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Signature expires %s\n"
+
+#: 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:2210
+msgid "binary"
+msgstr "binary"
+
+#: g10/mainproc.c:2211
+msgid "textmode"
+msgstr "textmode"
+
+#: g10/mainproc.c:2211 g10/trust.c:123 dirmngr/ocsp.c:706
+msgid "unknown"
+msgstr "unknown"
+
+#: g10/mainproc.c:2213
+msgid ", key algorithm "
+msgstr ", key algorithm "
+
+#: 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:2287
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Can't check signature: %s\n"
+
+#: 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: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:2442
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "standalone signature of class 0x%02x\n"
+
+#: 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:1059
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: deprecated option “[1m%s[0m”\n"
+
+#: 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:1065
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "please use “[1m%s%s[0m” instead\n"
+
+#: 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: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: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:1150
+msgid "Uncompressed"
+msgstr "Uncompressed"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:1175
+msgid "uncompressed|none"
+msgstr "uncompressed|none"
+
+#: 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:1457
+#, c-format
+msgid "ambiguous option '%s'\n"
+msgstr "ambiguous option ‘[1m%s[0m’\n"
+
+#: g10/misc.c:1482
+#, c-format
+msgid "unknown option '%s'\n"
+msgstr "unknown option ‘[1m%s[0m’\n"
+
+#: 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: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:763
++#: g10/pkclist.c:72 g10/revoke.c:776
+msgid "No reason specified"
+msgstr "No reason specified"
+
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
+msgid "Key is superseded"
+msgstr "Key is superseded"
+
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
+msgid "Key has been compromised"
+msgstr "Key has been compromised"
+
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
+msgid "Key is no longer used"
+msgstr "Key is no longer used"
+
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
+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:792
++#: g10/pkclist.c:310 g10/revoke.c:805
+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:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: skipped: %s\n"
+
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: skipped: public key is disabled\n"
+
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: skipped: public key already present\n"
+
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
+#, c-format
+msgid "can't encrypt to '%s'\n"
+msgstr "can't encrypt to ‘[1m%s[0m’\n"
+
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
+#, 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:1012
++#: g10/pkclist.c:1007
+#, 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:1115
++#: g10/pkclist.c:1110
+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:1139
++#: g10/pkclist.c:1134
+msgid "Current recipients:\n"
+msgstr "Current recipients:\n"
+
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
+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:1189
++#: g10/pkclist.c:1184
+msgid "No such user ID.\n"
+msgstr "No such user ID.\n"
+
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
+msgid "skipped: public key already set as default recipient\n"
+msgstr "skipped: public key already set as default recipient\n"
+
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
+msgid "Public key is disabled.\n"
+msgstr "Public key is disabled.\n"
+
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
+msgid "skipped: public key already set\n"
+msgstr "skipped: public key already set\n"
+
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
+#, c-format
+msgid "unknown default recipient \"%s\"\n"
+msgstr "unknown default recipient “[1m%s[0m”\n"
+
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
+msgid "no valid addressees\n"
+msgstr "no valid addressees\n"
+
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
+#, c-format
+msgid "Note: key %s has no %s feature\n"
+msgstr "Note: key %s has no %s feature\n"
+
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
+#, 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:98 g10/pubkey-enc.c:139 sm/decrypt.c:493
+#, c-format
+msgid "key %s is not suitable for decryption in %s mode\n"
+msgstr "key %s is not suitable for decryption in %s mode\n"
+
+#: g10/pubkey-enc.c:131
+#, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "anonymous recipient; trying secret key %s ...\n"
+
+#: g10/pubkey-enc.c:150
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "okay, we are the anonymous recipient.\n"
+
+#: g10/pubkey-enc.c:310
+msgid "old encoding of the DEK is not supported\n"
+msgstr "old encoding of the DEK is not supported\n"
+
+#: g10/pubkey-enc.c:338
+#, 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:382
+#, 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:415
+#, c-format
+msgid "Note: secret key %s expired at %s\n"
+msgstr "Note: secret key %s expired at %s\n"
+
+#: g10/pubkey-enc.c:422
+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:733
++#: g10/revoke.c:335 g10/revoke.c:746
+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:552
++#: g10/revoke.c:565
+msgid "This is a revocation certificate for the OpenPGP key:"
+msgstr "This is a revocation certificate for the OpenPGP key:"
+
- #: g10/revoke.c:568
++#: g10/revoke.c:581
+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:571
++#: g10/revoke.c:584
+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:577
++#: g10/revoke.c:590
+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:596
++#: g10/revoke.c:609
+#, c-format
+msgid "revocation certificate stored as '%s.rev'\n"
+msgstr "revocation certificate stored as ‘[1m%s.rev[0m’\n"
+
- #: g10/revoke.c:640
++#: g10/revoke.c:653
+#, 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:667
++#: g10/revoke.c:680
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr "‘[1m%s[0m’ matches multiple secret keys:\n"
+
- #: g10/revoke.c:694
++#: g10/revoke.c:707
+#, c-format
+msgid "error searching the keyring: %s\n"
+msgstr "error searching the keyring: %s\n"
+
- #: g10/revoke.c:717
++#: g10/revoke.c:730
+msgid "Create a revocation certificate for this key? (y/N) "
+msgstr "Create a revocation certificate for this key? (y/N) "
+
- #: g10/revoke.c:741
++#: g10/revoke.c:754
+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:775
++#: g10/revoke.c:788
+msgid "Please select the reason for the revocation:\n"
+msgstr "Please select the reason for the revocation:\n"
+
- #: g10/revoke.c:785
++#: g10/revoke.c:798
+msgid "Cancel"
+msgstr "Cancel"
+
- #: g10/revoke.c:787
++#: g10/revoke.c:800
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Probably you want to select %d here)\n"
+
- #: g10/revoke.c:828
++#: g10/revoke.c:841
+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:856
++#: g10/revoke.c:869
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Reason for revocation: %s\n"
+
- #: g10/revoke.c:858
++#: g10/revoke.c:871
+msgid "(No description given)\n"
+msgstr "(No description given)\n"
+
- #: g10/revoke.c:863
++#: g10/revoke.c:876
+msgid "Is this okay? (y/N) "
+msgstr "Is this okay? (y/N) "
+
+#: 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:153
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "WARNING: signature digest conflict in message\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 "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:193
+#, c-format
+msgid "please see %s for more information\n"
+msgstr "please see %s for more information\n"
+
+#: 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: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: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: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: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:373
+#, c-format
+msgid "Note: signature key %s expired %s\n"
+msgstr "Note: signature key %s expired %s\n"
+
+#: 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: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:1118
+#, 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:1121
+#, 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: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: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: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:363
+#, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s/%s signature from: “[1m%s[0m”\n"
+
+#: 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:1053
+msgid "signing:"
+msgstr "signing:"
+
+#: g10/sign.c:1330
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "%s encryption will be used\n"
+
+#: 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:205
+#, c-format
+msgid "skipped \"%s\": duplicated\n"
+msgstr "skipped “[1m%s[0m”: duplicated\n"
+
+#: g10/skclist.c:224
+msgid "skipped: secret key already present\n"
+msgstr "skipped: secret key already present\n"
+
+#: 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: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: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: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: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:504
+#, c-format
+msgid "unsupported TOFU database version: %s\n"
+msgstr "unsupported TOFU database version: %s\n"
+
+#: 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: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: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
++#: g10/tofu.c:3408
+#, c-format
+msgid "error reading TOFU database: %s\n"
+msgstr "error reading TOFU database: %s\n"
+
+#: 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: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:843
+#, c-format
+msgid "error creating 'encryptions' TOFU table: %s\n"
+msgstr "error creating ‘[1mencryptions[0m’ TOFU table: %s\n"
+
+#: 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:955
+#, c-format
+msgid "error opening TOFU database '%s': %s\n"
+msgstr "error opening TOFU database '%s': %s\n"
+
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
+#, c-format
+msgid "error updating TOFU database: %s\n"
+msgstr "error updating TOFU database: %s\n"
+
+#: 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: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: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: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:1608
+#, c-format
+msgid "error gathering other user IDs: %s\n"
+msgstr "error gathering other user IDs: %s\n"
+
+#: g10/tofu.c:1618
+msgid "This key's user IDs:\n"
+msgstr "This key's user IDs:\n"
+
+#: g10/tofu.c:1634 g10/tofu.c:1799
+#, c-format
+msgid "policy: %s"
+msgstr "policy: %s"
+
+#: g10/tofu.c:1725
+#, c-format
+msgid "error gathering signature stats: %s\n"
+msgstr "error gathering signature stats: %s\n"
+
+#: 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: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:1797
+msgid "this key"
+msgstr "this key"
+
+#: 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: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: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: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: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: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: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: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: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: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:1898
+#, c-format
+msgid "Messages verified in the past: %d."
+msgstr "Messages verified in the past: %d."
+
+#: 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: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:1961
+msgid "gGaAuUrRbB"
+msgstr "gGaAuUrRbB"
+
+#: 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:1975
+msgid "Defaulting to unknown.\n"
+msgstr "Defaulting to unknown.\n"
+
+#: g10/tofu.c:2090 g10/tofu.c:2226
+msgid "TOFU db corruption detected.\n"
+msgstr "TOFU db corruption detected.\n"
+
+#: g10/tofu.c:2146
+#, c-format
+msgid "resetting keydb: %s\n"
+msgstr "resetting keydb: %s\n"
+
+#: 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:2826
+#, c-format
+msgid "error changing TOFU policy: %s\n"
+msgstr "error changing TOFU policy: %s\n"
+
+#: g10/tofu.c:2877
+#, c-format
+msgid "%lld~year"
+msgid_plural "%lld~years"
+msgstr[0] "%lld~year"
+msgstr[1] "%lld~years"
+
+#: g10/tofu.c:2882
+#, c-format
+msgid "%lld~month"
+msgid_plural "%lld~months"
+msgstr[0] "%lld~month"
+msgstr[1] "%lld~months"
+
+#: g10/tofu.c:2887
+#, c-format
+msgid "%lld~week"
+msgid_plural "%lld~weeks"
+msgstr[0] "%lld~week"
+msgstr[1] "%lld~weeks"
+
+#: g10/tofu.c:2892
+#, c-format
+msgid "%lld~day"
+msgid_plural "%lld~days"
+msgstr[0] "%lld~day"
+msgstr[1] "%lld~days"
+
+#: g10/tofu.c:2897
+#, c-format
+msgid "%lld~hour"
+msgid_plural "%lld~hours"
+msgstr[0] "%lld~hour"
+msgstr[1] "%lld~hours"
+
+#: g10/tofu.c:2902
+#, c-format
+msgid "%lld~minute"
+msgid_plural "%lld~minutes"
+msgstr[0] "%lld~minute"
+msgstr[1] "%lld~minutes"
+
+#: g10/tofu.c:2904
+#, c-format
+msgid "%lld~second"
+msgid_plural "%lld~seconds"
+msgstr[0] "%lld~second"
+msgstr[1] "%lld~seconds"
+
+#: 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:3148
+#, c-format
+msgid "%s: Verified 0 signatures."
+msgstr "%s: Verified 0 signatures."
+
+#: 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:3166
+msgid "Encrypted 0 messages."
+msgstr "Encrypted 0 messages."
+
+#: 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:3185
+#, c-format
+msgid "(policy: %s)"
+msgstr "(policy: %s)"
+
+#: 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: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: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: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: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: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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
+#, c-format
+msgid "error opening TOFU database: %s\n"
+msgstr "error opening TOFU database: %s\n"
+
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
+#, 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:3915
++#: g10/tofu.c:3943
+#, 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:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
+#, 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:1385
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "public key %s not found: %s\n"
+
+#: g10/trustdb.c:1018
+msgid "please do a --check-trustdb\n"
+msgstr "please do a --check-trustdb\n"
+
+#: g10/trustdb.c:1023
+msgid "checking the trustdb\n"
+msgstr "checking the trustdb\n"
+
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
+#, c-format
+msgid "%d key processed"
+msgid_plural "%d keys processed"
+msgstr[0] "%d key processed"
+msgstr[1] "%d keys processed"
+
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
+#, 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:2030
++#: g10/trustdb.c:2034
+msgid "no ultimately trusted keys found\n"
+msgstr "no ultimately trusted keys found\n"
+
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
+#, 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:2162
++#: g10/trustdb.c:2166
+#, 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:2243
++#: g10/trustdb.c:2247
+#, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "unable to update trustdb version record: write failed: %s\n"
+
+#: g10/trust.c:125
+msgid "undefined"
+msgstr "undefined"
+
+#: g10/trust.c:126
+msgid "never"
+msgstr "never"
+
+#: g10/trust.c:127
+msgid "marginal"
+msgstr "marginal"
+
+#: g10/trust.c:128
+msgid "full"
+msgstr "full"
+
+#: g10/trust.c:129
+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:166
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr "10 translator see trust.c:uid_trust_string_fixed"
+
+#: g10/trust.c:169
+msgid "[ revoked]"
+msgstr "[ revoked]"
+
+#: g10/trust.c:171 g10/trust.c:177
+msgid "[ expired]"
+msgstr "[ expired]"
+
+#: g10/trust.c:176
+msgid "[ unknown]"
+msgstr "[ unknown]"
+
+#: g10/trust.c:178
+msgid "[ undef ]"
+msgstr "[ undef ]"
+
+#: g10/trust.c:179
+msgid "[ never ]"
+msgstr "[ never ]"
+
+#: g10/trust.c:180
+msgid "[marginal]"
+msgstr "[marginal]"
+
+#: g10/trust.c:181
+msgid "[ full ]"
+msgstr "[ full ]"
+
+#: g10/trust.c:182
+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: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: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: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: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:818
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "failed to store the fingerprint: %s\n"
+
+#: 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:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4753
+msgid "error retrieving CHV status from card\n"
+msgstr "error retrieving CHV status from card\n"
+
+#: 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: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: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: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: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:2008
+#, c-format
+msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
+msgstr "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
+
+#: 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:2037
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr "Remaining attempts: %d"
+
+#: 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: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:2113
+msgid "||Please unlock the card"
+msgstr "||Please unlock the card"
+
+#: 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: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:2246 scd/app-openpgp.c:4762
+msgid "card is permanently locked!\n"
+msgstr "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"
+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:2260
+msgid "|A|Please enter the Admin PIN"
+msgstr "|A|Please enter the Admin PIN"
+
+#: 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:2586
+msgid "||Please enter the PIN"
+msgstr "||Please enter the PIN"
+
+#: 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: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:2668
+msgid "|RN|New Reset Code"
+msgstr "|RN|New Reset Code"
+
+#: scd/app-openpgp.c:2669
+msgid "|AN|New Admin PIN"
+msgstr "|AN|New Admin PIN"
+
+#: scd/app-openpgp.c:2669
+msgid "|N|New PIN"
+msgstr "|N|New PIN"
+
+#: 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:2741
+msgid "||Please enter the PIN and New PIN"
+msgstr "||Please enter the PIN and New PIN"
+
+#: 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:2803 scd/app-openpgp.c:4065
+msgid "error reading fingerprint DO\n"
+msgstr "error reading fingerprint DO\n"
+
+#: scd/app-openpgp.c:2813
+msgid "key already exists\n"
+msgstr "key already exists\n"
+
+#: scd/app-openpgp.c:2817
+msgid "existing key will be replaced\n"
+msgstr "existing key will be replaced\n"
+
+#: scd/app-openpgp.c:2819
+msgid "generating new key\n"
+msgstr "generating new key\n"
+
+#: scd/app-openpgp.c:2821
+msgid "writing new key\n"
+msgstr "writing new key\n"
+
+#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
+msgid "creation timestamp missing\n"
+msgstr "creation timestamp missing\n"
+
+#: 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: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:3708
+msgid "unsupported curve\n"
+msgstr "unsupported curve\n"
+
+#: 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:3983
+msgid "generating key failed\n"
+msgstr "generating key failed\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] "key generation completed (%d second)\n"
+msgstr[1] "key generation completed (%d seconds)\n"
+
+#: 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: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: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:4274
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signatures created so far: %lu\n"
+
+#: scd/app-openpgp.c:4767
+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:5079 scd/app-openpgp.c:5090
+#, 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
++#: scd/scdaemon.c:115
+msgid "run in multi server mode (foreground)"
+msgstr "run in multi server mode (foreground)"
+
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr "|LEVEL|set the debugging level to LEVEL"
+
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
+msgid "|FILE|write a log to FILE"
+msgstr "|FILE|write a log to FILE"
+
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
+msgid "|N|connect to reader at port N"
+msgstr "|N|connect to reader at port N"
+
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NAME|use NAME as ct-API driver"
+
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NAME|use NAME as PC/SC driver"
+
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
+msgid "do not use the internal CCID driver"
+msgstr "do not use the internal CCID driver"
+
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr "|N|disconnect the card after N seconds of inactivity"
+
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
+msgid "do not use a reader's pinpad"
+msgstr "do not use a reader's pinpad"
+
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
+msgid "deny the use of admin card commands"
+msgstr "deny the use of admin card commands"
+
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
+msgid "use variable length input for pinpad"
+msgstr "use variable length input for pinpad"
+
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
+msgid "Usage: @SCDAEMON@ [options] (-h for help)"
+msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
+
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
+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
++#: scd/scdaemon.c:803
+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:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr "handler for fd %d started\n"
+
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
+#, c-format
+msgid "handler for fd %d terminated\n"
+msgstr "handler for fd %d terminated\n"
+
+#: sm/call-dirmngr.c:268 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: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: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: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:341
+msgid "(this is the RC2 algorithm)\n"
+msgstr "(this is the RC2 algorithm)\n"
+
+#: 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:330
+msgid "no valid recipients given\n"
+msgstr "no valid recipients given\n"
+
+#: sm/gpgsm.c:210
+msgid "list external keys"
+msgstr "list external keys"
+
+#: sm/gpgsm.c:212
+msgid "list certificate chain"
+msgstr "list certificate chain"
+
+#: sm/gpgsm.c:220
+msgid "import certificates"
+msgstr "import certificates"
+
+#: sm/gpgsm.c:221
+msgid "export certificates"
+msgstr "export certificates"
+
+#: sm/gpgsm.c:229
+msgid "register a smartcard"
+msgstr "register a smartcard"
+
+#: sm/gpgsm.c:232
+msgid "pass a command to the dirmngr"
+msgstr "pass a command to the dirmngr"
+
+#: sm/gpgsm.c:234
+msgid "invoke gpg-protect-tool"
+msgstr "invoke gpg-protect-tool"
+
+#: sm/gpgsm.c:251
+msgid "create base-64 encoded output"
+msgstr "create base-64 encoded output"
+
+#: sm/gpgsm.c:259
+msgid "assume input is in PEM format"
+msgstr "assume input is in PEM format"
+
+#: sm/gpgsm.c:261
+msgid "assume input is in base-64 format"
+msgstr "assume input is in base-64 format"
+
+#: sm/gpgsm.c:263
+msgid "assume input is in binary format"
+msgstr "assume input is in binary format"
+
+#: sm/gpgsm.c:270
+msgid "never consult a CRL"
+msgstr "never consult a CRL"
+
+#: sm/gpgsm.c:280
+msgid "check validity using OCSP"
+msgstr "check validity using OCSP"
+
+#: sm/gpgsm.c:285
+msgid "|N|number of certificates to include"
+msgstr "|N|number of certificates to include"
+
+#: sm/gpgsm.c:288
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|take policy information from FILE"
+
+#: sm/gpgsm.c:291
+msgid "do not check certificate policies"
+msgstr "do not check certificate policies"
+
+#: sm/gpgsm.c:295
+msgid "fetch missing issuer certificates"
+msgstr "fetch missing issuer certificates"
+
+#: sm/gpgsm.c:306
+msgid "don't use the terminal at all"
+msgstr "don't use the terminal at all"
+
+#: 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:313
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|write an audit log to FILE"
+
+#: sm/gpgsm.c:316
+msgid "batch mode: never ask"
+msgstr "batch mode: never ask"
+
+#: sm/gpgsm.c:317
+msgid "assume yes on most questions"
+msgstr "assume yes on most questions"
+
+#: sm/gpgsm.c:318
+msgid "assume no on most questions"
+msgstr "assume no on most questions"
+
+#: 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:324
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|use USER-ID as default secret key"
+
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|use this keyserver to lookup keys"
+
+#: sm/gpgsm.c:351
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|use cipher algorithm NAME"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|use message digest algorithm NAME"
+
+#: sm/gpgsm.c:560
+msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
+msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
+
+#: 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: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:778
+#, c-format
+msgid "unknown validation model '%s'\n"
+msgstr "unknown validation model ‘[1m%s[0m’\n"
+
+#: 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: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:869 dirmngr/ldapserver.c:126
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: skipping this line\n"
+
+#: sm/gpgsm.c:1431
+msgid "could not parse keyserver\n"
+msgstr "could not parse keyserver\n"
+
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
+#, c-format
+msgid "importing common certificates '%s'\n"
+msgstr "importing common certificates ‘[1m%s[0m’\n"
+
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
+#, c-format
+msgid "can't sign using '%s': %s\n"
+msgstr "can't sign using '%s': %s\n"
+
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
+msgid "invalid command (there is no implicit command)\n"
+msgstr "invalid command (there is no implicit command)\n"
+
+#: sm/import.c:127
+#, c-format
+msgid "total number processed: %lu\n"
+msgstr "total number processed: %lu\n"
+
+#: sm/import.c:246
+msgid "error storing certificate\n"
+msgstr "error storing certificate\n"
+
+#: sm/import.c:254
+msgid "basic certificate checks failed - not imported\n"
+msgstr "basic certificate checks failed - not imported\n"
+
+#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "error getting stored flags: %s\n"
+
+#: sm/import.c:531 sm/import.c:563
+#, c-format
+msgid "error importing certificate: %s\n"
+msgstr "error importing certificate: %s\n"
+
+#: sm/import.c:751 tools/gpg-connect-agent.c:1433
+#, c-format
+msgid "error reading input: %s\n"
+msgstr "error reading input: %s\n"
+
+#: sm/keydb.c:1126 sm/keydb.c:1212
+msgid "failed to get the fingerprint\n"
+msgstr "failed to get the fingerprint\n"
+
+#: sm/keydb.c:1168
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr "problem looking for existing certificate: %s\n"
+
+#: sm/keydb.c:1180
+#, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "error finding writable keyDB: %s\n"
+
+#: sm/keydb.c:1188
+#, c-format
+msgid "error storing certificate: %s\n"
+msgstr "error storing certificate: %s\n"
+
+#: sm/keydb.c:1240
+#, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "problem re-searching certificate: %s\n"
+
+#: sm/keydb.c:1261 sm/keydb.c:1350
+#, c-format
+msgid "error storing flags: %s\n"
+msgstr "error storing flags: %s\n"
+
+#: sm/keylist.c:669
+msgid "Error - "
+msgstr "Error - "
+
+#: sm/misc.c:58
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr "GPG_TTY has not been set - using maybe bogus default\n"
+
+#: sm/qualified.c:105
+#, c-format
+msgid "invalid formatted fingerprint in '%s', line %d\n"
+msgstr "invalid formatted fingerprint in '%s', line %d\n"
+
+#: sm/qualified.c:123
+#, c-format
+msgid "invalid country code in '%s', line %d\n"
+msgstr "invalid country code in '%s', line %d\n"
+
+#: sm/qualified.c:206
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+"You are about to create a signature using your certificate:\n"
+"“[1m%s[0m”\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+
+#: sm/qualified.c:215 sm/verify.c: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: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: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:560
+#, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "checking for qualified certificate failed: %s\n"
+
+#: sm/verify.c:486
+msgid "Signature made "
+msgstr "Signature made "
+
+#: sm/verify.c:490
+msgid "[date not given]"
+msgstr "[date not given]"
+
+#: sm/verify.c:491
+#, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr " using certificate ID 0x%08lX\n"
+
+#: 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:631
+msgid "Good signature from"
+msgstr "Good signature from"
+
+#: sm/verify.c:632
+msgid " aka"
+msgstr " aka"
+
+#: sm/verify.c:650
+msgid "This is a qualified signature\n"
+msgstr "This is a qualified signature\n"
+
+#: dirmngr/certcache.c:124
+#, c-format
+msgid "can't initialize certificate cache lock: %s\n"
+msgstr "can't initialize certificate cache lock: %s\n"
+
+#: dirmngr/certcache.c:135
+#, 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:146
+#, 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:157
+#, 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:297
+#, c-format
+msgid "dropping %u certificates from the cache\n"
+msgstr "dropping %u certificates from the cache\n"
+
+#: dirmngr/certcache.c:415 dirmngr/certcache.c:502 dirmngr/certcache.c:612
+#, c-format
+msgid "can't parse certificate '%s': %s\n"
+msgstr "can't parse certificate '%s': %s\n"
+
+#: dirmngr/certcache.c:423 dirmngr/certcache.c:509 dirmngr/certcache.c:623
+#, c-format
+msgid "certificate '%s' already cached\n"
+msgstr "certificate ‘[1m%s[0m’ already cached\n"
+
+#: dirmngr/certcache.c:427 dirmngr/certcache.c:517 dirmngr/certcache.c:632
+#, c-format
+msgid "trusted certificate '%s' loaded\n"
+msgstr "trusted certificate ‘[1m%s[0m’ loaded\n"
+
+#: dirmngr/certcache.c:429
+#, c-format
+msgid "certificate '%s' loaded\n"
+msgstr "certificate ‘[1m%s[0m’ loaded\n"
+
+#: dirmngr/certcache.c:433 dirmngr/certcache.c:519 dirmngr/certcache.c:634
+#, c-format
+msgid " SHA1 fingerprint = %s\n"
+msgstr " SHA1 fingerprint = %s\n"
+
+#: dirmngr/certcache.c:436 dirmngr/certcache.c:522 dirmngr/certcache.c:637
+msgid " issuer ="
+msgstr " issuer ="
+
+#: dirmngr/certcache.c:437 dirmngr/certcache.c:523 dirmngr/certcache.c:638
+msgid " subject ="
+msgstr " subject ="
+
+#: dirmngr/certcache.c:441 dirmngr/certcache.c:511 dirmngr/certcache.c:626
+#, c-format
+msgid "error loading certificate '%s': %s\n"
+msgstr "error loading certificate '%s': %s\n"
+
+#: dirmngr/certcache.c:811
+#, c-format
+msgid "permanently loaded certificates: %u\n"
+msgstr "permanently loaded certificates: %u\n"
+
+#: dirmngr/certcache.c:813
+#, c-format
+msgid " runtime cached certificates: %u\n"
+msgstr " runtime cached certificates: %u\n"
+
+#: dirmngr/certcache.c:815
+#, c-format
+msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
+msgstr " trusted certificates: %u (%u,%u,%u,%u)\n"
+
+#: dirmngr/certcache.c:843 dirmngr/dirmngr-client.c:385
+msgid "certificate already cached\n"
+msgstr "certificate already cached\n"
+
+#: dirmngr/certcache.c:845
+msgid "certificate cached\n"
+msgstr "certificate cached\n"
+
+#: dirmngr/certcache.c:847 dirmngr/certcache.c:867
+#: dirmngr/dirmngr-client.c:389
+#, c-format
+msgid "error caching certificate: %s\n"
+msgstr "error caching certificate: %s\n"
+
+#: dirmngr/certcache.c:930
+#, c-format
+msgid "invalid SHA1 fingerprint string '%s'\n"
+msgstr "invalid SHA1 fingerprint string ‘[1m%s[0m’\n"
+
+#: dirmngr/certcache.c:1376 dirmngr/certcache.c:1385
+#, c-format
+msgid "error fetching certificate by S/N: %s\n"
+msgstr "error fetching certificate by S/N: %s\n"
+
+#: dirmngr/certcache.c:1537 dirmngr/certcache.c:1546
+#, c-format
+msgid "error fetching certificate by subject: %s\n"
+msgstr "error fetching certificate by subject: %s\n"
+
+#: dirmngr/certcache.c:1652 dirmngr/validate.c:483
+msgid "no issuer found in certificate\n"
+msgstr "no issuer found in certificate\n"
+
+#: dirmngr/certcache.c:1662
+#, 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:1700
+#, c-format
+msgid "ksba_crl_parse failed: %s\n"
+msgstr "ksba_crl_parse failed: %s\n"
+
+#: dirmngr/crlcache.c:1715
+#, c-format
+msgid "error getting update times of CRL: %s\n"
+msgstr "error getting update times of CRL: %s\n"
+
+#: dirmngr/crlcache.c:1722
+#, 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:1726
+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:1746
+#, c-format
+msgid "error getting CRL item: %s\n"
+msgstr "error getting CRL item: %s\n"
+
+#: dirmngr/crlcache.c:1761
+#, 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:1788
+#, c-format
+msgid "no CRL issuer found in CRL: %s\n"
+msgstr "no CRL issuer found in CRL: %s\n"
+
+#: dirmngr/crlcache.c:1803
+msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
+msgstr "locating CRL issuer certificate by authorityKeyIdentifier\n"
+
+#: dirmngr/crlcache.c:1849
+#, c-format
+msgid "CRL signature verification failed: %s\n"
+msgstr "CRL signature verification failed: %s\n"
+
+#: dirmngr/crlcache.c:1861
+#, 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:166
++#: dirmngr/dirmngr.c:169
+msgid "list the contents of the CRL cache"
+msgstr "list the contents of the CRL cache"
+
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
+msgid "|FILE|load CRL from FILE into cache"
+msgstr "|FILE|load CRL from FILE into cache"
+
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
+msgid "|URL|fetch a CRL from URL"
+msgstr "|URL|fetch a CRL from URL"
+
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
+msgid "shutdown the dirmngr"
+msgstr "shutdown the dirmngr"
+
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
+msgid "flush the cache"
+msgstr "flush the cache"
+
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|write server mode logs to FILE"
+
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
+msgid "run without asking a user"
+msgstr "run without asking a user"
+
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
+msgid "force loading of outdated CRLs"
+msgstr "force loading of outdated CRLs"
+
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
+msgid "allow sending OCSP requests"
+msgstr "allow sending OCSP requests"
+
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
+msgid "allow online software version check"
+msgstr "allow online software version check"
+
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
+msgid "inhibit the use of HTTP"
+msgstr "inhibit the use of HTTP"
+
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
+msgid "inhibit the use of LDAP"
+msgstr "inhibit the use of LDAP"
+
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
+msgid "ignore HTTP CRL distribution points"
+msgstr "ignore HTTP CRL distribution points"
+
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
+msgid "ignore LDAP CRL distribution points"
+msgstr "ignore LDAP CRL distribution points"
+
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignore certificate contained OCSP service URLs"
+
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
+msgid "|URL|redirect all HTTP requests to URL"
+msgstr "|URL|redirect all HTTP requests to URL"
+
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
+msgid "|HOST|use HOST for LDAP queries"
+msgstr "|HOST|use HOST for LDAP queries"
+
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
+msgid "do not use fallback hosts with --ldap-proxy"
+msgstr "do not use fallback hosts with --ldap-proxy"
+
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
+msgid "|FILE|read LDAP server list from FILE"
+msgstr "|FILE|read LDAP server list from FILE"
+
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
+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:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
+msgid "|N|set LDAP timeout to N seconds"
+msgstr "|N|set LDAP timeout to N seconds"
+
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
+msgid "|URL|use OCSP responder at URL"
+msgstr "|URL|use OCSP responder at URL"
+
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
+msgid "|FPR|OCSP response signed by FPR"
+msgstr "|FPR|OCSP response signed by FPR"
+
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
+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:229
++#: dirmngr/dirmngr.c:232
+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:231
++#: dirmngr/dirmngr.c:234
+msgid "route all network traffic via Tor"
+msgstr "route all network traffic via Tor"
+
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
+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:392
++#: dirmngr/dirmngr.c:400
+msgid "Usage: @DIRMNGR@ [options] (-h for help)"
+msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
+
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
+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:474
++#: dirmngr/dirmngr.c:482
+#, c-format
+msgid "valid debug levels are: %s\n"
+msgstr "valid debug levels are: %s\n"
+
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
+#, c-format
+msgid "usage: %s [options] "
+msgstr "usage: %s [options] "
+
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
+msgid "colons are not allowed in the socket name\n"
+msgstr "colons are not allowed in the socket name\n"
+
- #: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
+#, c-format
+msgid "fetching CRL from '%s' failed: %s\n"
+msgstr "fetching CRL from ‘[1m%s[0m’ failed: %s\n"
+
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
+#, c-format
+msgid "processing CRL from '%s' failed: %s\n"
+msgstr "processing CRL from ‘[1m%s[0m’ failed: %s\n"
+
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
+#, c-format
+msgid "%s:%u: line too long - skipped\n"
+msgstr "%s:%u: line too long - skipped\n"
+
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
+#, c-format
+msgid "%s:%u: invalid fingerprint detected\n"
+msgstr "%s:%u: invalid fingerprint detected\n"
+
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
+#, c-format
+msgid "%s:%u: read error: %s\n"
+msgstr "%s:%u: read error: %s\n"
+
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
+#, 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:1838
++#: dirmngr/dirmngr.c:1851
+msgid "SIGHUP received - re-reading configuration and flushing caches\n"
+msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
+
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
+msgid "SIGUSR2 received - no action defined\n"
+msgstr "SIGUSR2 received - no action defined\n"
+
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
+msgid "SIGTERM received - shutting down ...\n"
+msgstr "SIGTERM received - shutting down ...\n"
+
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
+#, c-format
+msgid "SIGTERM received - still %d active connections\n"
+msgstr "SIGTERM received - still %d active connections\n"
+
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
+msgid "shutdown forced\n"
+msgstr "shutdown forced\n"
+
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
+msgid "SIGINT received - immediate shutdown\n"
+msgstr "SIGINT received - immediate shutdown\n"
+
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
+#, 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:618
+#, c-format
+msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgstr "start_cert_fetch: invalid pattern ‘[1m%s[0m’\n"
+
+#: 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: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:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#, c-format
+msgid "assuan_inquire(%s) failed: %s\n"
+msgstr "assuan_inquire(%s) failed: %s\n"
+
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
+msgid "ldapserver missing"
+msgstr "ldapserver missing"
+
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
+msgid "serialno missing in cert ID"
+msgstr "serialno missing in cert ID"
+
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
+#, c-format
+msgid "assuan_inquire failed: %s\n"
+msgstr "assuan_inquire failed: %s\n"
+
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
+#, c-format
+msgid "fetch_cert_by_url failed: %s\n"
+msgstr "fetch_cert_by_url failed: %s\n"
+
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
+#, c-format
+msgid "error sending data: %s\n"
+msgstr "error sending data: %s\n"
+
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
+#, c-format
+msgid "start_cert_fetch failed: %s\n"
+msgstr "start_cert_fetch failed: %s\n"
+
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
+#, c-format
+msgid "fetch_next_cert failed: %s\n"
+msgstr "fetch_next_cert failed: %s\n"
+
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
+#, c-format
+msgid "max_replies %d exceeded\n"
+msgstr "max_replies %d exceeded\n"
+
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
+#, c-format
+msgid "can't allocate control structure: %s\n"
+msgstr "can't allocate control structure: %s\n"
+
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
+#, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "failed to allocate assuan context: %s\n"
+
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
+#, c-format
+msgid "failed to initialize the server: %s\n"
+msgstr "failed to initialize the server: %s\n"
+
- #: dirmngr/server.c:2632
++#: dirmngr/server.c:2738
+#, 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:2663
++#: dirmngr/server.c:2771
+#, c-format
+msgid "Assuan accept problem: %s\n"
+msgstr "Assuan accept problem: %s\n"
+
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
+#, 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
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
+msgid "Options controlling the diagnostic output"
+msgstr "Options controlling the diagnostic output"
+
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
+msgid "Options controlling the configuration"
+msgstr "Options controlling the configuration"
+
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
+msgid "Options useful for debugging"
+msgstr "Options useful for debugging"
+
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
+msgid "Options controlling the security"
+msgstr "Options controlling the security"
+
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|expire SSH keys after N seconds"
+
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|set maximum PIN cache lifetime to N seconds"
+
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|set maximum SSH key lifetime to N seconds"
+
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
+msgid "Options enforcing a passphrase policy"
+msgstr "Options enforcing a passphrase policy"
+
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
+msgid "do not allow bypassing the passphrase policy"
+msgstr "do not allow bypassing the passphrase policy"
+
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr "|N|set minimal required length for new passphrases to N"
+
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr "|N|require at least N non-alpha characters for a new passphrase"
+
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE|check new passphrases against pattern in FILE"
+
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|expire the passphrase after N days"
+
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
+msgid "do not allow the reuse of old passphrases"
+msgstr "do not allow the reuse of old passphrases"
+
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|set the Pinentry timeout to N seconds"
+
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|use NAME as default secret key"
+
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|encrypt to user ID NAME as well"
+
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|set up email aliases"
+
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
+msgid "Configuration for Keyservers"
+msgstr "Configuration for Keyservers"
+
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|use keyserver at URL"
+
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
+msgid "allow PKA lookups (DNS requests)"
+msgstr "allow PKA lookups (DNS requests)"
+
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
+msgid "disable all access to the dirmngr"
+msgstr "disable all access to the dirmngr"
+
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
+
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
+msgid "do not check CRLs for root certificates"
+msgstr "do not check CRLs for root certificates"
+
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
+msgid "Options controlling the format of the output"
+msgstr "Options controlling the format of the output"
+
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
+msgid "Options controlling the interactivity and enforcement"
+msgstr "Options controlling the interactivity and enforcement"
+
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
+msgid "Options controlling the use of Tor"
+msgstr "Options controlling the use of Tor"
+
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
+msgid "Configuration for HTTP servers"
+msgstr "Configuration for HTTP servers"
+
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
+msgid "use system's HTTP proxy setting"
+msgstr "use system's HTTP proxy setting"
+
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
+msgid "Configuration of LDAP servers to use"
+msgstr "Configuration of LDAP servers to use"
+
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
+msgid "LDAP server list"
+msgstr "LDAP server list"
+
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
+msgid "Configuration for OCSP"
+msgstr "Configuration for OCSP"
+
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
+msgid "OpenPGP"
+msgstr "OpenPGP"
+
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
+msgid "Private Keys"
+msgstr "Private Keys"
+
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
+msgid "Smartcards"
+msgstr "Smartcards"
+
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
+msgid "S/MIME"
+msgstr "S/MIME"
+
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
+msgid "Network"
+msgstr "Network"
+
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
+msgid "Passphrase Entry"
+msgstr "Passphrase Entry"
+
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
+msgid "Component not suitable for launching"
+msgstr "Component not suitable for launching"
+
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
+#, c-format
+msgid "External verification of component %s failed"
+msgstr "External verification of component %s failed"
+
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
+msgid "Note that group specifications are ignored\n"
+msgstr "Note that group specifications are ignored\n"
+
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
+#, c-format
+msgid "error closing '%s'\n"
+msgstr "error closing ‘[1m%s[0m’\n"
+
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
+#, c-format
+msgid "error parsing '%s'\n"
+msgstr "error parsing ‘[1m%s[0m’\n"
+
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
+msgid "list all components"
+msgstr "list all components"
+
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
+msgid "check all programs"
+msgstr "check all programs"
+
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
+msgid "|COMPONENT|list options"
+msgstr "|COMPONENT|list options"
+
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
+msgid "|COMPONENT|change options"
+msgstr "|COMPONENT|change options"
+
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
+msgid "|COMPONENT|check options"
+msgstr "|COMPONENT|check options"
+
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+msgid "apply global default values"
+msgstr "apply global default values"
+
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
+msgid "|FILE|update configuration files using FILE"
+msgstr "|FILE|update configuration files using FILE"
+
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
+msgid "get the configuration directories for @GPGCONF@"
+msgstr "get the configuration directories for @GPGCONF@"
+
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
+msgid "list global configuration file"
+msgstr "list global configuration file"
+
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
+msgid "check global configuration file"
+msgstr "check global configuration file"
+
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
+msgid "query the software version database"
+msgstr "query the software version database"
+
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
+msgid "reload all or a given component"
+msgstr "reload all or a given component"
+
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
+msgid "launch a given component"
+msgstr "launch a given component"
+
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
+msgid "kill a given component"
+msgstr "kill a given component"
+
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
+msgid "use as output file"
+msgstr "use as output file"
+
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
+msgid "activate changes at runtime, if possible"
+msgstr "activate changes at runtime, if possible"
+
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
+msgid "Usage: @GPGCONF@ [options] (-h for help)"
+msgstr "Usage: @GPGCONF@ [options] (-h for help)"
+
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
+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:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
+msgid "Need one component argument"
+msgstr "Need one component argument"
+
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
+msgid "Component not found"
+msgstr "Component not found"
+
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
+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 24aa072,0000000..53fd277
mode 100644,000000..100644
--- a/po/en at quot.po
+++ b/po/en at quot.po
@@@ -1,10689 -1,0 +1,10684 @@@
+# 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.2.3\n"
++"Project-Id-Version: GNU gnupg 2.2.4\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-11-20 12:04+0100\n"
- "PO-Revision-Date: 2017-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
++"PO-Revision-Date: 2017-12-20 09:14+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: agent/call-pinentry.c:305
+#, 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:508
+msgid "|pinentry-label|_OK"
+msgstr "|pinentry-label|_OK"
+
+#: agent/call-pinentry.c:509
+msgid "|pinentry-label|_Cancel"
+msgstr "|pinentry-label|_Cancel"
+
+#: agent/call-pinentry.c:510
+msgid "|pinentry-label|_Yes"
+msgstr "|pinentry-label|_Yes"
+
+#: agent/call-pinentry.c:511
+msgid "|pinentry-label|_No"
+msgstr "|pinentry-label|_No"
+
+#: agent/call-pinentry.c:512
+msgid "|pinentry-label|PIN:"
+msgstr "|pinentry-label|PIN:"
+
+#: agent/call-pinentry.c:513
+msgid "|pinentry-label|_Save in password manager"
+msgstr "|pinentry-label|_Save in password manager"
+
+#: agent/call-pinentry.c:514
+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:516
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr "|pinentry-tt|Make passphrase visible"
+
+#: agent/call-pinentry.c:517
+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:849
+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:870
+msgid "pinentry.qualitybar.tooltip"
+msgstr "pinentry.qualitybar.tooltip"
+
+#: agent/call-pinentry.c:998
+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:1001
+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:1038 agent/call-pinentry.c:1217
+msgid "PIN:"
+msgstr "PIN:"
+
+#: agent/call-pinentry.c:1038 agent/call-pinentry.c:1217
+#: agent/protect-tool.c:714 tools/symcryptrun.c:452
+msgid "Passphrase:"
+msgstr "Passphrase:"
+
+#: agent/call-pinentry.c:1065 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:1085
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr "SETERROR %s (try %d of %d)"
+
+#: agent/call-pinentry.c:1096
+msgid "Repeat:"
+msgstr "Repeat:"
+
+#: agent/call-pinentry.c:1125 agent/call-pinentry.c:1137
+msgid "PIN too long"
+msgstr "PIN too long"
+
+#: agent/call-pinentry.c:1126
+msgid "Passphrase too long"
+msgstr "Passphrase too long"
+
+#: agent/call-pinentry.c:1134
+msgid "Invalid characters in PIN"
+msgstr "Invalid characters in PIN"
+
+#: agent/call-pinentry.c:1139
+msgid "PIN too short"
+msgstr "PIN too short"
+
+#: agent/call-pinentry.c:1152
+msgid "Bad PIN"
+msgstr "Bad PIN"
+
+#: agent/call-pinentry.c:1152
+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:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
+#, c-format
+msgid "can't open '%s': %s\n"
+msgstr "can't open '%s': %s\n"
+
+#: 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:2462
+#, c-format
+msgid "detected card with S/N: %s\n"
+msgstr "detected card with S/N: %s\n"
+
+#: 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:2487
+#, c-format
+msgid "no suitable card key found: %s\n"
+msgstr "no suitable card key found: %s\n"
+
+#: 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: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:2795
+msgid "Allow"
+msgstr "Allow"
+
+#: agent/command-ssh.c:2795
+msgid "Deny"
+msgstr "Deny"
+
+#: 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:3053 agent/genkey.c:351
+msgid "Please re-enter this passphrase"
+msgstr "Please re-enter this passphrase"
+
+#: 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: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:117
+msgid "Please insert the card with serial number"
+msgstr "Please insert the card with serial number"
+
+#: 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:246
+msgid "Admin PIN"
+msgstr "Admin PIN"
+
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:251
+msgid "PUK"
+msgstr "PUK"
+
+#: agent/divert-scd.c:258
+msgid "Reset Code"
+msgstr "Reset Code"
+
+#: 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:356
+msgid "Repeat this Reset Code"
+msgstr "Repeat this Reset Code"
+
+#: agent/divert-scd.c:358
+msgid "Repeat this PUK"
+msgstr "Repeat this PUK"
+
+#: agent/divert-scd.c:359
+msgid "Repeat this PIN"
+msgstr "Repeat this PIN"
+
+#: 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:366
+msgid "PUK not correctly repeated; try again"
+msgstr "PUK not correctly repeated; try again"
+
+#: agent/divert-scd.c:367
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN not correctly repeated; try again"
+
+#: 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:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Options:\n"
+" "
+
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
+msgid "run in daemon mode (background)"
+msgstr "run in daemon mode (background)"
+
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
+msgid "run in server mode (foreground)"
+msgstr "run in server mode (foreground)"
+
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
+msgid "run in supervised mode"
+msgstr "run in supervised mode"
+
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
+msgid "verbose"
+msgstr "verbose"
+
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
+msgid "be somewhat more quiet"
+msgstr "be somewhat more quiet"
+
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
+msgid "sh-style command output"
+msgstr "sh-style command output"
+
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
+msgid "csh-style command output"
+msgstr "csh-style command output"
+
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
+msgid "|FILE|read options from FILE"
+msgstr "|FILE|read options from FILE"
+
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr "do not detach from the console"
+
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
+msgid "use a log file for the server"
+msgstr "use a log file for the server"
+
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|use PGM as the PIN-Entry program"
+
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|use PGM as the SCdaemon program"
+
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
+msgid "do not use the SCdaemon"
+msgstr "do not use the SCdaemon"
+
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
+msgid "|NAME|accept some commands via NAME"
+msgstr "|NAME|accept some commands via NAME"
+
- #: agent/gpg-agent.c:208
++#: agent/gpg-agent.c:210
+msgid "ignore requests to change the TTY"
+msgstr "ignore requests to change the TTY"
+
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
+msgid "ignore requests to change the X display"
+msgstr "ignore requests to change the X display"
+
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
+msgid "|N|expire cached PINs after N seconds"
+msgstr "|N|expire cached PINs after N seconds"
+
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
+msgid "do not use the PIN cache when signing"
+msgstr "do not use the PIN cache when signing"
+
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
+msgid "disallow the use of an external password cache"
+msgstr "disallow the use of an external password cache"
+
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
+msgid "disallow clients to mark keys as \"trusted\""
+msgstr "disallow clients to mark keys as “trusted”"
+
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
+msgid "allow presetting passphrase"
+msgstr "allow presetting passphrase"
+
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
+msgid "disallow caller to override the pinentry"
+msgstr "disallow caller to override the pinentry"
+
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
+msgid "allow passphrase to be prompted through Emacs"
+msgstr "allow passphrase to be prompted through Emacs"
+
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
+msgid "enable ssh support"
+msgstr "enable ssh support"
+
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr "|ALGO|use ALGO to show ssh fingerprints"
+
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
+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:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
+msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
+msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
+
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
+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:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
+#, c-format
+msgid "invalid debug-level '%s' given\n"
+msgstr "invalid debug-level ‘%s’ given\n"
+
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
+msgid "selected digest algorithm is invalid\n"
+msgstr "selected digest algorithm is invalid\n"
+
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Note: no default option file ‘%s’\n"
+
- #: agent/gpg-agent.c:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 tools/symcryptrun.c:944
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "option file '%s': %s\n"
+
- #: agent/gpg-agent.c:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
+#, c-format
+msgid "reading options from '%s'\n"
+msgstr "reading options from ‘%s’\n"
+
- #: agent/gpg-agent.c:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
+#, c-format
+msgid "Note: '%s' is not considered an option\n"
+msgstr "Note: ‘%s’ is not considered an option\n"
+
- #: agent/gpg-agent.c:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
+#, c-format
+msgid "can't create socket: %s\n"
+msgstr "can't create socket: %s\n"
+
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
+#, c-format
+msgid "socket name '%s' is too long\n"
+msgstr "socket name ‘%s’ is too long\n"
+
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
+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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
+msgid "error getting nonce for the socket\n"
+msgstr "error getting nonce for the socket\n"
+
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
+#, c-format
+msgid "error binding socket to '%s': %s\n"
+msgstr "error binding socket to '%s': %s\n"
+
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
+#, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "can't set permissions of '%s': %s\n"
+
- #: agent/gpg-agent.c:2241 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
- #, c-format
- msgid "listen() failed: %s\n"
- msgstr "listen() failed: %s\n"
-
- #: agent/gpg-agent.c:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
+#, c-format
+msgid "listening on socket '%s'\n"
+msgstr "listening on socket ‘%s’\n"
+
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
+#, c-format
+msgid "stat() failed for '%s': %s\n"
+msgstr "stat() failed for '%s': %s\n"
+
- #: agent/gpg-agent.c:2327
++#: agent/gpg-agent.c:2351
+#, c-format
+msgid "can't use '%s' as home directory\n"
+msgstr "can't use ‘%s’ as home directory\n"
+
- #: agent/gpg-agent.c:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
+#, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "error reading nonce on fd %d: %s\n"
+
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
+msgstr "handler 0x%lx for fd %d started\n"
+
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr "handler 0x%lx for fd %d terminated\n"
+
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
+#, 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:2771
++#: agent/gpg-agent.c:2795
+#, 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:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
+#, c-format
+msgid "npth_pselect failed: %s - waiting 1s\n"
+msgstr "npth_pselect failed: %s - waiting 1s\n"
+
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
+#, c-format
+msgid "%s %s stopped\n"
+msgstr "%s %s stopped\n"
+
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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: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: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:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Commands:\n"
+" "
+
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 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:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
+#, 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: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: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:1515 agent/findkey.c:1529
+msgid "Delete key"
+msgstr "Delete key"
+
+#: 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: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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
+#, 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: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: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: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:890
+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 g10/gpg.c:3494
+#, 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:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
+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:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
+#, 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:225
+#, 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: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: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:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
+#, c-format
+msgid "WARNING: %s\n"
+msgstr "WARNING: %s\n"
+
+#: g10/call-agent.c:214 sm/call-agent.c:113 sm/call-dirmngr.c:180
+msgid "Note: Outdated servers may lack important security fixes.\n"
+msgstr "Note: Outdated servers may lack important security fixes.\n"
+
+#: g10/call-agent.c:216 sm/call-agent.c:115 sm/call-dirmngr.c:182
+#, c-format
+msgid "Note: Use the command \"%s\" to restart them.\n"
+msgstr "Note: Use the command “%s” to restart them.\n"
+
+#: g10/call-agent.c:301 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
+#: sm/call-agent.c:191 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:1775
+#, 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:1781
+#, 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:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
+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: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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 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:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
+#, c-format
+msgid "error reading '%s': %s\n"
+msgstr "error reading '%s': %s\n"
+
- #: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
+#, c-format
+msgid "error writing '%s': %s\n"
+msgstr "error writing '%s': %s\n"
+
+#: g10/card-util.c:928
+msgid "Login data (account name): "
+msgstr "Login data (account name): "
+
+#: g10/card-util.c:966
+msgid "Private DO data: "
+msgstr "Private DO data: "
+
+#: g10/card-util.c:1051
+msgid "Language preferences: "
+msgstr "Language preferences: "
+
+#: 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:1068
+msgid "Error: invalid characters in preference string.\n"
+msgstr "Error: invalid characters in preference string.\n"
+
+#: 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:1104
+msgid "Error: invalid response.\n"
+msgstr "Error: invalid response.\n"
+
+#: g10/card-util.c:1126
+msgid "CA fingerprint: "
+msgstr "CA fingerprint: "
+
+#: g10/card-util.c:1149
+msgid "Error: invalid formatted fingerprint.\n"
+msgstr "Error: invalid formatted fingerprint.\n"
+
+#: 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:1200
+msgid "not an OpenPGP card"
+msgstr "not an OpenPGP card"
+
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
+#, c-format
+msgid "error getting current key info: %s\n"
+msgstr "error getting current key info: %s\n"
+
+#: g10/card-util.c:1300
+msgid "Replace existing key? (y/N) "
+msgstr "Replace existing key? (y/N) "
+
+#: 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: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: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: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:1358
+#, c-format
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr "The card will now be re-configured to generate a key of type: %s\n"
+
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: 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:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 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:1382
+#, 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:1410
+#, 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:1434
+msgid "Make off-card backup of encryption key? (Y/n) "
+msgstr "Make off-card backup of encryption key? (Y/n) "
+
+#: g10/card-util.c:1448
+msgid "Note: keys are already stored on the card!\n"
+msgstr "Note: keys are already stored on the card!\n"
+
+#: g10/card-util.c:1451
+msgid "Replace existing keys? (y/N) "
+msgstr "Replace existing keys? (y/N) "
+
+#: g10/card-util.c:1463
+#, 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:1529
+msgid "Please select the type of key to generate:\n"
+msgstr "Please select the type of key to generate:\n"
+
+#: g10/card-util.c:1531 g10/card-util.c:1651
+msgid " (1) Signature key\n"
+msgstr " (1) Signature key\n"
+
+#: g10/card-util.c:1532 g10/card-util.c:1653
+msgid " (2) Encryption key\n"
+msgstr " (2) Encryption key\n"
+
+#: g10/card-util.c:1533 g10/card-util.c:1655
+msgid " (3) Authentication key\n"
+msgstr " (3) Authentication key\n"
+
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
+msgid "Invalid selection.\n"
+msgstr "Invalid selection.\n"
+
+#: g10/card-util.c:1648
+msgid "Please select where to store the key:\n"
+msgstr "Please select where to store the key:\n"
+
+#: g10/card-util.c:1694
+#, c-format
+msgid "KEYTOCARD failed: %s\n"
+msgstr "KEYTOCARD failed: %s\n"
+
+#: g10/card-util.c:1787
+msgid "This command is not supported by this card\n"
+msgstr "This command is not supported by this card\n"
+
+#: g10/card-util.c:1792
+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:1795
+msgid "Continue? (y/N) "
+msgstr "Continue? (y/N) "
+
+#: g10/card-util.c:1800
+msgid "Really do a factory reset? (enter \"yes\") "
+msgstr "Really do a factory reset? (enter “yes”) "
+
+#: g10/card-util.c:1875 g10/keyedit.c:1256
+msgid "quit this menu"
+msgstr "quit this menu"
+
+#: g10/card-util.c:1877
+msgid "show admin commands"
+msgstr "show admin commands"
+
+#: g10/card-util.c:1878 g10/keyedit.c:1259
+msgid "show this help"
+msgstr "show this help"
+
+#: g10/card-util.c:1880
+msgid "list all available data"
+msgstr "list all available data"
+
+#: g10/card-util.c:1883
+msgid "change card holder's name"
+msgstr "change card holder's name"
+
+#: g10/card-util.c:1884
+msgid "change URL to retrieve key"
+msgstr "change URL to retrieve key"
+
+#: g10/card-util.c:1885
+msgid "fetch the key specified in the card URL"
+msgstr "fetch the key specified in the card URL"
+
+#: g10/card-util.c:1886
+msgid "change the login name"
+msgstr "change the login name"
+
+#: g10/card-util.c:1887
+msgid "change the language preferences"
+msgstr "change the language preferences"
+
+#: g10/card-util.c:1888
+msgid "change card holder's sex"
+msgstr "change card holder's sex"
+
+#: g10/card-util.c:1889
+msgid "change a CA fingerprint"
+msgstr "change a CA fingerprint"
+
+#: g10/card-util.c:1890
+msgid "toggle the signature force PIN flag"
+msgstr "toggle the signature force PIN flag"
+
+#: g10/card-util.c:1891
+msgid "generate new keys"
+msgstr "generate new keys"
+
+#: g10/card-util.c:1892
+msgid "menu to change or unblock the PIN"
+msgstr "menu to change or unblock the PIN"
+
+#: g10/card-util.c:1893
+msgid "verify the PIN and list all data"
+msgstr "verify the PIN and list all data"
+
+#: g10/card-util.c:1894
+msgid "unblock the PIN using a Reset Code"
+msgstr "unblock the PIN using a Reset Code"
+
+#: g10/card-util.c:1895
+msgid "destroy all keys and data"
+msgstr "destroy all keys and data"
+
+#: g10/card-util.c:2019
+msgid "gpg/card> "
+msgstr "gpg/card> "
+
+#: g10/card-util.c:2060
+msgid "Admin-only command\n"
+msgstr "Admin-only command\n"
+
+#: g10/card-util.c:2091
+msgid "Admin commands are allowed\n"
+msgstr "Admin commands are allowed\n"
+
+#: g10/card-util.c:2093
+msgid "Admin commands are not allowed\n"
+msgstr "Admin commands are not allowed\n"
+
+#: g10/card-util.c:2188 g10/keyedit.c:2224
+msgid "Invalid command (try \"help\")\n"
+msgstr "Invalid command (try “help”)\n"
+
+#: 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:5017 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:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 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
++#: g10/delkey.c:118 g10/getkey.c:582
+#, 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:244 g10/sign.c:1336
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "error creating passphrase: %s\n"
+
+#: 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:265
+#, c-format
+msgid "using cipher %s\n"
+msgstr "using cipher %s\n"
+
+#: g10/encrypt.c:275 g10/encrypt.c:689
+#, c-format
+msgid "'%s' already compressed\n"
+msgstr "‘%s’ already compressed\n"
+
+#: 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:570
+#, c-format
+msgid "reading from '%s'\n"
+msgstr "reading from ‘%s’\n"
+
+#: 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:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
+#, 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: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:970
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s encrypted for: “%s”\n"
+
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
+#, c-format
+msgid "option '%s' may not be used in %s mode\n"
+msgstr "option ‘%s’ may not be used in %s mode\n"
+
+#: g10/decrypt-data.c:94 g10/mainproc.c:305
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s encrypted data\n"
+
+#: 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: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: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:1236
+msgid " - skipped"
+msgstr " - skipped"
+
+#: g10/export.c:1269 g10/import.c:1835 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:1709
++#: g10/export.c:1714
+#, c-format
+msgid "key %s: key material on-card - skipped\n"
+msgstr "key %s: key material on-card - skipped\n"
+
- #: g10/export.c:1904
++#: g10/export.c:1909
+msgid "exporting secret keys not allowed\n"
+msgstr "exporting secret keys not allowed\n"
+
- #: g10/export.c:1981
++#: g10/export.c:1986
+#, 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:2068
++#: g10/export.c:2073
+msgid "WARNING: nothing exported\n"
+msgstr "WARNING: nothing exported\n"
+
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
+#, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "(check argument of option '%s')\n"
+
- #: g10/getkey.c:515
++#: g10/getkey.c:509
+#, 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
++#: g10/getkey.c:638
+#, 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:1452
++#: g10/getkey.c:1460
+#, c-format
+msgid "automatically retrieved '%s' via %s\n"
+msgstr "automatically retrieved ‘%s’ via %s\n"
+
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
+#, c-format
+msgid "error retrieving '%s' via %s: %s\n"
+msgstr "error retrieving ‘%s’ via %s: %s\n"
+
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
+msgid "No fingerprint"
+msgstr "No fingerprint"
+
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "secret key “%s” not found: %s\n"
+
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
+#, 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:2042
++#: g10/getkey.c:2050
+#, 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:2049
++#: g10/getkey.c:2057
+#, c-format
+msgid "all values passed to '%s' ignored\n"
+msgstr "all values passed to ‘%s’ ignored\n"
+
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
+#, 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:3716
++#: g10/getkey.c:3724
+#, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "using subkey %s instead of primary key %s\n"
+
- #: g10/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
+#, c-format
+msgid "valid values for option '%s':\n"
+msgstr "valid values for option '%s':\n"
+
+#: g10/gpg.c:434 sm/gpgsm.c:201
+msgid "make a signature"
+msgstr "make a signature"
+
+#: g10/gpg.c:435
+msgid "make a clear text signature"
+msgstr "make a clear text signature"
+
+#: g10/gpg.c:437 sm/gpgsm.c:203
+msgid "make a detached signature"
+msgstr "make a detached signature"
+
+#: g10/gpg.c:438 sm/gpgsm.c:204
+msgid "encrypt data"
+msgstr "encrypt data"
+
+#: g10/gpg.c:440
+msgid "encryption only with symmetric cipher"
+msgstr "encryption only with symmetric cipher"
+
+#: g10/gpg.c:442 sm/gpgsm.c:206
+msgid "decrypt data (default)"
+msgstr "decrypt data (default)"
+
+#: g10/gpg.c:444 sm/gpgsm.c:207
+msgid "verify a signature"
+msgstr "verify a signature"
+
+#: g10/gpg.c:446 sm/gpgsm.c:208
+msgid "list keys"
+msgstr "list keys"
+
+#: g10/gpg.c:448
+msgid "list keys and signatures"
+msgstr "list keys and signatures"
+
+#: g10/gpg.c:451
+msgid "list and check key signatures"
+msgstr "list and check key signatures"
+
+#: g10/gpg.c:453 sm/gpgsm.c:213
+msgid "list keys and fingerprints"
+msgstr "list keys and fingerprints"
+
+#: g10/gpg.c:454 sm/gpgsm.c:211
+msgid "list secret keys"
+msgstr "list secret keys"
+
+#: g10/gpg.c:456 sm/gpgsm.c:214
+msgid "generate a new key pair"
+msgstr "generate a new key pair"
+
+#: g10/gpg.c:459
+msgid "quickly generate a new key pair"
+msgstr "quickly generate a new key pair"
+
+#: g10/gpg.c:462
+msgid "quickly add a new user-id"
+msgstr "quickly add a new user-id"
+
+#: g10/gpg.c:467
+msgid "quickly revoke a user-id"
+msgstr "quickly revoke a user-id"
+
+#: g10/gpg.c:470
+msgid "quickly set a new expiration date"
+msgstr "quickly set a new expiration date"
+
+#: g10/gpg.c:473
+msgid "full featured key pair generation"
+msgstr "full featured key pair generation"
+
+#: g10/gpg.c:476
+msgid "generate a revocation certificate"
+msgstr "generate a revocation certificate"
+
+#: g10/gpg.c:479 sm/gpgsm.c:217
+msgid "remove keys from the public keyring"
+msgstr "remove keys from the public keyring"
+
+#: g10/gpg.c:481
+msgid "remove keys from the secret keyring"
+msgstr "remove keys from the secret keyring"
+
+#: g10/gpg.c:483
+msgid "quickly sign a key"
+msgstr "quickly sign a key"
+
+#: g10/gpg.c:485
+msgid "quickly sign a key locally"
+msgstr "quickly sign a key locally"
+
+#: g10/gpg.c:486
+msgid "sign a key"
+msgstr "sign a key"
+
+#: g10/gpg.c:487
+msgid "sign a key locally"
+msgstr "sign a key locally"
+
+#: g10/gpg.c:488
+msgid "sign or edit a key"
+msgstr "sign or edit a key"
+
+#: g10/gpg.c:490 sm/gpgsm.c:235
+msgid "change a passphrase"
+msgstr "change a passphrase"
+
+#: g10/gpg.c:494
+msgid "export keys"
+msgstr "export keys"
+
+#: g10/gpg.c:495
+msgid "export keys to a keyserver"
+msgstr "export keys to a keyserver"
+
+#: g10/gpg.c:496
+msgid "import keys from a keyserver"
+msgstr "import keys from a keyserver"
+
+#: g10/gpg.c:499
+msgid "search for keys on a keyserver"
+msgstr "search for keys on a keyserver"
+
+#: g10/gpg.c:501
+msgid "update all keys from a keyserver"
+msgstr "update all keys from a keyserver"
+
+#: g10/gpg.c:507
+msgid "import/merge keys"
+msgstr "import/merge keys"
+
+#: g10/gpg.c:510
+msgid "print the card status"
+msgstr "print the card status"
+
+#: g10/gpg.c:511
+msgid "change data on a card"
+msgstr "change data on a card"
+
+#: g10/gpg.c:513
+msgid "change a card's PIN"
+msgstr "change a card's PIN"
+
+#: g10/gpg.c:525
+msgid "update the trust database"
+msgstr "update the trust database"
+
+#: g10/gpg.c:534
+msgid "print message digests"
+msgstr "print message digests"
+
+#: g10/gpg.c:537 sm/gpgsm.c:230
+msgid "run in server mode"
+msgstr "run in server mode"
+
+#: g10/gpg.c:539
+msgid "|VALUE|set the TOFU policy for a key"
+msgstr "|VALUE|set the TOFU policy for a key"
+
+#: g10/gpg.c:543 sm/gpgsm.c:249
+msgid "create ascii armored output"
+msgstr "create ascii armored output"
+
+#: g10/gpg.c:546 sm/gpgsm.c:265
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|encrypt for USER-ID"
+
+#: g10/gpg.c:562 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:568
+msgid "|N|set compress level to N (0 disables)"
+msgstr "|N|set compress level to N (0 disables)"
+
+#: g10/gpg.c:575
+msgid "use canonical text mode"
+msgstr "use canonical text mode"
+
+#: g10/gpg.c:592 g10/gpgv.c:80 sm/gpgsm.c:303
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|write output to FILE"
+
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
+msgid "do not make any changes"
+msgstr "do not make any changes"
+
+#: g10/gpg.c:608
+msgid "prompt before overwriting"
+msgstr "prompt before overwriting"
+
+#: g10/gpg.c:658
+msgid "use strict OpenPGP behavior"
+msgstr "use strict OpenPGP behavior"
+
+#: g10/gpg.c:684 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:687
+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:1059
+msgid "Usage: @GPG@ [options] [files] (-h for help)"
+msgstr "Usage: @GPG@ [options] [files] (-h for help)"
+
+#: g10/gpg.c:1062
+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:1073 sm/gpgsm.c:581
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Supported algorithms:\n"
+
+#: g10/gpg.c:1076
+msgid "Pubkey: "
+msgstr "Pubkey: "
+
+#: g10/gpg.c:1083 g10/keyedit.c:3042
+msgid "Cipher: "
+msgstr "Cipher: "
+
+#: g10/gpg.c:1090
+msgid "Hash: "
+msgstr "Hash: "
+
+#: g10/gpg.c:1097 g10/keyedit.c:3091
+msgid "Compression: "
+msgstr "Compression: "
+
+#: g10/gpg.c:1166 sm/gpgsm.c:655
+#, c-format
+msgid "usage: %s [options] %s\n"
+msgstr "usage: %s [options] %s\n"
+
+#: g10/gpg.c:1354 sm/gpgsm.c:744
+msgid "conflicting commands\n"
+msgstr "conflicting commands\n"
+
+#: g10/gpg.c:1372
+#, c-format
+msgid "no = sign found in group definition '%s'\n"
+msgstr "no = sign found in group definition ‘%s’\n"
+
+#: g10/gpg.c:1570
+#, c-format
+msgid "WARNING: unsafe ownership on homedir '%s'\n"
+msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
+
+#: g10/gpg.c:1573
+#, c-format
+msgid "WARNING: unsafe ownership on configuration file '%s'\n"
+msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
+
+#: g10/gpg.c:1576
+#, c-format
+msgid "WARNING: unsafe ownership on extension '%s'\n"
+msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
+
+#: g10/gpg.c:1582
+#, c-format
+msgid "WARNING: unsafe permissions on homedir '%s'\n"
+msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
+
+#: g10/gpg.c:1585
+#, c-format
+msgid "WARNING: unsafe permissions on configuration file '%s'\n"
+msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
+
+#: g10/gpg.c:1588
+#, c-format
+msgid "WARNING: unsafe permissions on extension '%s'\n"
+msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
+
+#: g10/gpg.c:1594
+#, 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:1597
+#, 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:1600
+#, 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:1606
+#, 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:1609
+#, 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:1612
+#, 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:1828
+#, c-format
+msgid "unknown configuration item '%s'\n"
+msgstr "unknown configuration item ‘%s’\n"
+
+#: g10/gpg.c:1943
+msgid "display photo IDs during key listings"
+msgstr "display photo IDs during key listings"
+
+#: g10/gpg.c:1945
+msgid "show key usage information during key listings"
+msgstr "show key usage information during key listings"
+
+#: g10/gpg.c:1947
+msgid "show policy URLs during signature listings"
+msgstr "show policy URLs during signature listings"
+
+#: g10/gpg.c:1949
+msgid "show all notations during signature listings"
+msgstr "show all notations during signature listings"
+
+#: g10/gpg.c:1951
+msgid "show IETF standard notations during signature listings"
+msgstr "show IETF standard notations during signature listings"
+
+#: g10/gpg.c:1955
+msgid "show user-supplied notations during signature listings"
+msgstr "show user-supplied notations during signature listings"
+
+#: g10/gpg.c:1957
+msgid "show preferred keyserver URLs during signature listings"
+msgstr "show preferred keyserver URLs during signature listings"
+
+#: g10/gpg.c:1959
+msgid "show user ID validity during key listings"
+msgstr "show user ID validity during key listings"
+
+#: g10/gpg.c:1961
+msgid "show revoked and expired user IDs in key listings"
+msgstr "show revoked and expired user IDs in key listings"
+
+#: g10/gpg.c:1963
+msgid "show revoked and expired subkeys in key listings"
+msgstr "show revoked and expired subkeys in key listings"
+
+#: g10/gpg.c:1965
+msgid "show the keyring name in key listings"
+msgstr "show the keyring name in key listings"
+
+#: g10/gpg.c:1967
+msgid "show expiration dates during signature listings"
+msgstr "show expiration dates during signature listings"
+
+#: g10/gpg.c:2080
+#, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "unknown TOFU policy ‘%s’\n"
+
+#: g10/gpg.c:2082
+msgid "(use \"help\" to list choices)\n"
+msgstr "(use “help” to list choices)\n"
+
+#: g10/gpg.c:2233
+#, c-format
+msgid "Note: old default options file '%s' ignored\n"
+msgstr "Note: old default options file ‘%s’ ignored\n"
+
+#: g10/gpg.c:2850 g10/gpg.c:3656 g10/gpg.c:3668
+#, c-format
+msgid "Note: %s is not for normal use!\n"
+msgstr "Note: %s is not for normal use!\n"
+
+#: g10/gpg.c:3030 g10/gpg.c:3042
+#, c-format
+msgid "'%s' is not a valid signature expiration\n"
+msgstr "‘%s’ is not a valid signature expiration\n"
+
+#: g10/gpg.c:3064
+#, c-format
+msgid "\"%s\" is not a proper mail address\n"
+msgstr "“%s” is not a proper mail address\n"
+
+#: g10/gpg.c:3096 sm/gpgsm.c:1162
+#, c-format
+msgid "invalid pinentry mode '%s'\n"
+msgstr "invalid pinentry mode ‘%s’\n"
+
+#: g10/gpg.c:3151
+#, c-format
+msgid "'%s' is not a valid character set\n"
+msgstr "‘%s’ is not a valid character set\n"
+
+#: g10/gpg.c:3173 g10/gpg.c:3379 g10/keyedit.c:5008
+msgid "could not parse keyserver URL\n"
+msgstr "could not parse keyserver URL\n"
+
+#: g10/gpg.c:3191
+#, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: invalid keyserver options\n"
+
+#: g10/gpg.c:3194
+msgid "invalid keyserver options\n"
+msgstr "invalid keyserver options\n"
+
+#: g10/gpg.c:3201
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: invalid import options\n"
+
+#: g10/gpg.c:3204
+msgid "invalid import options\n"
+msgstr "invalid import options\n"
+
+#: g10/gpg.c:3210 g10/gpg.c:3225
+#, c-format
+msgid "invalid filter option: %s\n"
+msgstr "invalid filter option: %s\n"
+
+#: g10/gpg.c:3216
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: invalid export options\n"
+
+#: g10/gpg.c:3219
+msgid "invalid export options\n"
+msgstr "invalid export options\n"
+
+#: g10/gpg.c:3231
+#, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: invalid list options\n"
+
+#: g10/gpg.c:3234
+msgid "invalid list options\n"
+msgstr "invalid list options\n"
+
+#: g10/gpg.c:3242
+msgid "display photo IDs during signature verification"
+msgstr "display photo IDs during signature verification"
+
+#: g10/gpg.c:3244
+msgid "show policy URLs during signature verification"
+msgstr "show policy URLs during signature verification"
+
+#: g10/gpg.c:3246
+msgid "show all notations during signature verification"
+msgstr "show all notations during signature verification"
+
+#: g10/gpg.c:3248
+msgid "show IETF standard notations during signature verification"
+msgstr "show IETF standard notations during signature verification"
+
+#: g10/gpg.c:3252
+msgid "show user-supplied notations during signature verification"
+msgstr "show user-supplied notations during signature verification"
+
+#: g10/gpg.c:3254
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "show preferred keyserver URLs during signature verification"
+
+#: g10/gpg.c:3256
+msgid "show user ID validity during signature verification"
+msgstr "show user ID validity during signature verification"
+
+#: g10/gpg.c:3258
+msgid "show revoked and expired user IDs in signature verification"
+msgstr "show revoked and expired user IDs in signature verification"
+
+#: g10/gpg.c:3260
+msgid "show only the primary user ID in signature verification"
+msgstr "show only the primary user ID in signature verification"
+
+#: g10/gpg.c:3262
+msgid "validate signatures with PKA data"
+msgstr "validate signatures with PKA data"
+
+#: g10/gpg.c:3264
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr "elevate the trust of signatures with valid PKA data"
+
+#: g10/gpg.c:3271
+#, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: invalid verify options\n"
+
+#: g10/gpg.c:3274
+msgid "invalid verify options\n"
+msgstr "invalid verify options\n"
+
+#: g10/gpg.c:3281
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "unable to set exec-path to %s\n"
+
+#: g10/gpg.c:3482
+#, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: invalid auto-key-locate list\n"
+
+#: g10/gpg.c:3485
+msgid "invalid auto-key-locate list\n"
+msgstr "invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
+msgid "WARNING: program may create a core file!\n"
+msgstr "WARNING: program may create a core file!\n"
+
+#: g10/gpg.c:3649
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "WARNING: %s overrides %s\n"
+
+#: g10/gpg.c:3658
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s not allowed with %s!\n"
+
+#: g10/gpg.c:3661
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s makes no sense with %s!\n"
+
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
+msgid "WARNING: running with faked system time: "
+msgstr "WARNING: running with faked system time: "
+
+#: g10/gpg.c:3697
+#, 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:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
+msgid "selected cipher algorithm is invalid\n"
+msgstr "selected cipher algorithm is invalid\n"
+
+#: g10/gpg.c:3744
+msgid "selected compression algorithm is invalid\n"
+msgstr "selected compression algorithm is invalid\n"
+
+#: g10/gpg.c:3750
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "selected certification digest algorithm is invalid\n"
+
+#: g10/gpg.c:3765
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed must be greater than 0\n"
+
+#: g10/gpg.c:3767
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed must be greater than 1\n"
+
+#: g10/gpg.c:3769
+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:3771
+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:3773
+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:3776
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
+msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
+
+#: g10/gpg.c:3780
+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:3787
+msgid "invalid default preferences\n"
+msgstr "invalid default preferences\n"
+
+#: g10/gpg.c:3791
+msgid "invalid personal cipher preferences\n"
+msgstr "invalid personal cipher preferences\n"
+
+#: g10/gpg.c:3795
+msgid "invalid personal digest preferences\n"
+msgstr "invalid personal digest preferences\n"
+
+#: g10/gpg.c:3799
+msgid "invalid personal compress preferences\n"
+msgstr "invalid personal compress preferences\n"
+
+#: g10/gpg.c:3835
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s does not yet work with %s\n"
+
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 sm/sign.c:478 sm/verify.c:473
+#, c-format
+msgid "digest algorithm '%s' may not be used in %s mode\n"
+msgstr "digest algorithm ‘%s’ may not be used in %s mode\n"
+
+#: g10/gpg.c:3894
+#, c-format
+msgid "compression algorithm '%s' may not be used in %s mode\n"
+msgstr "compression algorithm ‘%s’ may not be used in %s mode\n"
+
+#: g10/gpg.c:4034
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "failed to initialize the TrustDB: %s\n"
+
+#: g10/gpg.c:4046
+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:4118
+#, c-format
+msgid "symmetric encryption of '%s' failed: %s\n"
+msgstr "symmetric encryption of ‘%s’ failed: %s\n"
+
+#: g10/gpg.c:4147
+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:4150
+#, c-format
+msgid "you cannot use --symmetric --encrypt in %s mode\n"
+msgstr "you cannot use --symmetric --encrypt in %s mode\n"
+
+#: g10/gpg.c:4208
+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:4211
+#, c-format
+msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
+msgstr "you cannot use --symmetric --sign --encrypt in %s mode\n"
+
+#: g10/gpg.c:4568 g10/keyserver.c:1846
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "keyserver send failed: %s\n"
+
+#: g10/gpg.c:4573
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "keyserver receive failed: %s\n"
+
+#: g10/gpg.c:4579
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "key export failed: %s\n"
+
+#: g10/gpg.c:4592
+#, c-format
+msgid "export as ssh key failed: %s\n"
+msgstr "export as ssh key failed: %s\n"
+
+#: g10/gpg.c:4604
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "keyserver search failed: %s\n"
+
+#: g10/gpg.c:4617
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "keyserver refresh failed: %s\n"
+
+#: g10/gpg.c:4684
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "dearmoring failed: %s\n"
+
+#: g10/gpg.c:4695
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "enarmoring failed: %s\n"
+
+#: g10/gpg.c:4787
+#, c-format
+msgid "invalid hash algorithm '%s'\n"
+msgstr "invalid hash algorithm ‘%s’\n"
+
+#: g10/gpg.c:4936 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:4948
+#, 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:4996
+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:5007
+msgid "Go ahead and type your message ...\n"
+msgstr "Go ahead and type your message ...\n"
+
+#: g10/gpg.c:5346
+msgid "the given certification policy URL is invalid\n"
+msgstr "the given certification policy URL is invalid\n"
+
+#: g10/gpg.c:5348
+msgid "the given signature policy URL is invalid\n"
+msgstr "the given signature policy URL is invalid\n"
+
+#: g10/gpg.c:5381
+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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
+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:160
+msgid "import signatures that are marked as local-only"
+msgstr "import signatures that are marked as local-only"
+
+#: 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:166
+msgid "do not clear the ownertrust values during import"
+msgstr "do not clear the ownertrust values during import"
+
+#: g10/import.c:169
+msgid "do not update the trustdb after import"
+msgstr "do not update the trustdb after import"
+
+#: g10/import.c:172
+msgid "show key during import"
+msgstr "show key during import"
+
+#: g10/import.c:175
+msgid "only accept updates to existing keys"
+msgstr "only accept updates to existing keys"
+
+#: g10/import.c:178
+msgid "remove unusable parts from key after import"
+msgstr "remove unusable parts from key after import"
+
+#: 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:184
+msgid "run import filters and export key immediately"
+msgstr "run import filters and export key immediately"
+
+#: g10/import.c:187
+msgid "assume the GnuPG key backup format"
+msgstr "assume the GnuPG key backup format"
+
+#: g10/import.c:191
+msgid "repair keys on import"
+msgstr "repair keys on import"
+
+#: g10/import.c:356 g10/import.c:594
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "skipping block of type %d\n"
+
+#: g10/import.c:611
+#, c-format
+msgid "%lu keys processed so far\n"
+msgstr "%lu keys processed so far\n"
+
+#: g10/import.c:681
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Total number processed: %lu\n"
+
+#: g10/import.c:684
+#, c-format
+msgid " skipped PGP-2 keys: %lu\n"
+msgstr " skipped PGP-2 keys: %lu\n"
+
+#: g10/import.c:686
+#, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " skipped new keys: %lu\n"
+
+#: g10/import.c:689
+#, c-format
+msgid " w/o user IDs: %lu\n"
+msgstr " w/o user IDs: %lu\n"
+
+#: g10/import.c:692 sm/import.c:130
+#, c-format
+msgid " imported: %lu"
+msgstr " imported: %lu"
+
+#: g10/import.c:696 sm/import.c:134
+#, c-format
+msgid " unchanged: %lu\n"
+msgstr " unchanged: %lu\n"
+
+#: g10/import.c:698
+#, c-format
+msgid " new user IDs: %lu\n"
+msgstr " new user IDs: %lu\n"
+
+#: g10/import.c:700
+#, c-format
+msgid " new subkeys: %lu\n"
+msgstr " new subkeys: %lu\n"
+
+#: g10/import.c:702
+#, c-format
+msgid " new signatures: %lu\n"
+msgstr " new signatures: %lu\n"
+
+#: g10/import.c:704
+#, c-format
+msgid " new key revocations: %lu\n"
+msgstr " new key revocations: %lu\n"
+
+#: g10/import.c:706 sm/import.c:136
+#, c-format
+msgid " secret keys read: %lu\n"
+msgstr " secret keys read: %lu\n"
+
+#: g10/import.c:708 sm/import.c:138
+#, c-format
+msgid " secret keys imported: %lu\n"
+msgstr " secret keys imported: %lu\n"
+
+#: g10/import.c:710 sm/import.c:140
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr " secret keys unchanged: %lu\n"
+
+#: g10/import.c:712 sm/import.c:142
+#, c-format
+msgid " not imported: %lu\n"
+msgstr " not imported: %lu\n"
+
+#: g10/import.c:714
+#, c-format
+msgid " signatures cleaned: %lu\n"
+msgstr " signatures cleaned: %lu\n"
+
+#: g10/import.c:716
+#, c-format
+msgid " user IDs cleaned: %lu\n"
+msgstr " user IDs cleaned: %lu\n"
+
+#: g10/import.c:1069
+#, 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:1111
+#, c-format
+msgid " \"%s\": preference for cipher algorithm %s\n"
+msgstr " “%s”: preference for cipher algorithm %s\n"
+
+#: g10/import.c:1126
+#, c-format
+msgid " \"%s\": preference for digest algorithm %s\n"
+msgstr " “%s”: preference for digest algorithm %s\n"
+
+#: g10/import.c:1138
+#, c-format
+msgid " \"%s\": preference for compression algorithm %s\n"
+msgstr " “%s”: preference for compression algorithm %s\n"
+
+#: g10/import.c:1151
+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:1153
+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:1178
+#, 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:1665 g10/import.c:2477
+#, c-format
+msgid "key %s: no user ID\n"
+msgstr "key %s: no user ID\n"
+
+#: g10/import.c:1671
+#, c-format
+msgid "key %s: %s\n"
+msgstr "key %s: %s\n"
+
+#: g10/import.c:1672 g10/import.c:2451
+msgid "rejected by import screener"
+msgstr "rejected by import screener"
+
+#: g10/import.c:1704
+#, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "key %s: PKS subkey corruption repaired\n"
+
+#: g10/import.c:1725
+#, 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:1735 g10/import.c:1766
+#, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "key %s: no valid user IDs\n"
+
+#: g10/import.c:1737
+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:1812 g10/import.c:2629
+#, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "key %s: public key not found: %s\n"
+
+#: g10/import.c:1818
+#, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "key %s: new key - skipped\n"
+
+#: g10/import.c:1830
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "no writable keyring found: %s\n"
+
+#: g10/import.c:1857 g10/import.c:1947 g10/import.c:2695
+#, c-format
+msgid "error writing keyring '%s': %s\n"
+msgstr "error writing keyring '%s': %s\n"
+
+#: g10/import.c:1880
+#, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "key %s: public key “%s” imported\n"
+
+#: g10/import.c:1904
+#, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "key %s: doesn't match our copy\n"
+
+#: g10/import.c:1961
+#, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "key %s: “%s” 1 new user ID\n"
+
+#: g10/import.c:1964
+#, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "key %s: “%s” %d new user IDs\n"
+
+#: g10/import.c:1967
+#, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "key %s: “%s” 1 new signature\n"
+
+#: g10/import.c:1970
+#, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "key %s: “%s” %d new signatures\n"
+
+#: g10/import.c:1973
+#, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "key %s: “%s” 1 new subkey\n"
+
+#: g10/import.c:1976
+#, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "key %s: “%s” %d new subkeys\n"
+
+#: g10/import.c:1979
+#, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "key %s: “%s” %d signature cleaned\n"
+
+#: g10/import.c:1982
+#, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "key %s: “%s” %d signatures cleaned\n"
+
+#: g10/import.c:1985
+#, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "key %s: “%s” %d user ID cleaned\n"
+
+#: g10/import.c:1988
+#, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "key %s: “%s” %d user IDs cleaned\n"
+
+#: g10/import.c:2018
+#, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "key %s: “%s” not changed\n"
+
+#: g10/import.c:2329 g10/import.c:2575
+#, c-format
+msgid "key %s: secret key imported\n"
+msgstr "key %s: secret key imported\n"
+
+#: g10/import.c:2337
+#, c-format
+msgid "key %s: secret key already exists\n"
+msgstr "key %s: secret key already exists\n"
+
+#: g10/import.c:2345
+#, c-format
+msgid "key %s: error sending to agent: %s\n"
+msgstr "key %s: error sending to agent: %s\n"
+
+#: g10/import.c:2450
+#, c-format
+msgid "secret key %s: %s\n"
+msgstr "secret key %s: %s\n"
+
+#: g10/import.c:2470 g10/import.c:2505
+msgid "importing secret keys not allowed\n"
+msgstr "importing secret keys not allowed\n"
+
+#: g10/import.c:2494
+#, 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:2567
+#, 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:2622
+#, 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:2653
+#, 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:2660
+#, 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:2671
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "key %s: invalid revocation certificate: %s - rejected\n"
+
+#: g10/import.c:2704
+#, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "key %s: “%s” revocation certificate imported\n"
+
+#: g10/import.c:2780
+#, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "key %s: no user ID for signature\n"
+
+#: g10/import.c:2797
+#, 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:2799
+#, 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:2816 g10/import.c:2842 g10/import.c:2893
+#, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "key %s: unsupported public key algorithm\n"
+
+#: g10/import.c:2817
+#, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "key %s: invalid direct key signature\n"
+
+#: g10/import.c:2831
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "key %s: no subkey for key binding\n"
+
+#: g10/import.c:2844
+#, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "key %s: invalid subkey binding\n"
+
+#: g10/import.c:2860
+#, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "key %s: removed multiple subkey binding\n"
+
+#: g10/import.c:2882
+#, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "key %s: no subkey for key revocation\n"
+
+#: g10/import.c:2895
+#, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "key %s: invalid subkey revocation\n"
+
+#: g10/import.c:2910
+#, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "key %s: removed multiple subkey revocation\n"
+
+#: g10/import.c:2953
+#, c-format
+msgid "key %s: skipped user ID \"%s\"\n"
+msgstr "key %s: skipped user ID “%s”\n"
+
+#: g10/import.c:2977
+#, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "key %s: skipped subkey\n"
+
+#: g10/import.c:3006
+#, 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:3017
+#, 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:3035
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "key %s: invalid revocation certificate: %s - skipped\n"
+
+#: g10/import.c:3049
+#, 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:3057
+#, 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:3199
+#, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "key %s: duplicated user ID detected - merged\n"
+
+#: g10/import.c:3264
+#, 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:3280
+#, 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:3346
+#, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "key %s: “%s” revocation certificate added\n"
+
+#: g10/import.c:3384
+#, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "key %s: direct key signature added\n"
+
+#: g10/keydb.c:429 g10/keydb.c:456 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:432 g10/keydb.c:459
+#, c-format
+msgid "error creating keyring '%s': %s\n"
+msgstr "error creating keyring '%s': %s\n"
+
+#: g10/keydb.c:468 sm/keydb.c:232
+#, c-format
+msgid "keybox '%s' created\n"
+msgstr "keybox ‘%s’ created\n"
+
+#: g10/keydb.c:470
+#, c-format
+msgid "keyring '%s' created\n"
+msgstr "keyring ‘%s’ created\n"
+
+#: g10/keydb.c:848
+#, c-format
+msgid "keyblock resource '%s': %s\n"
+msgstr "keyblock resource '%s': %s\n"
+
+#: g10/keydb.c:954
+#, c-format
+msgid "error opening key DB: %s\n"
+msgstr "error opening key DB: %s\n"
+
+#: g10/keydb.c:1773
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "failed to rebuild keyring cache: %s\n"
+
+#: g10/keyedit.c:260
+msgid "[revocation]"
+msgstr "[revocation]"
+
+#: g10/keyedit.c:260
+msgid "[self-signature]"
+msgstr "[self-signature]"
+
+#: 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:387 g10/pkclist.c:286
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = I trust marginally\n"
+
+#: 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: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: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: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:559
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "User ID “%s” is revoked."
+
+#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
+#: g10/keyedit.c:1651
+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:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
+#: g10/keyedit.c:1656 g10/keyedit.c:2662
+msgid " Unable to sign.\n"
+msgstr " Unable to sign.\n"
+
+#: g10/keyedit.c:587
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "User ID “%s” is expired."
+
+#: 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:644
+#, c-format
+msgid "User ID \"%s\" is signable. "
+msgstr "User ID “%s” is signable. "
+
+#: g10/keyedit.c:646
+msgid "Sign it? (y/N) "
+msgstr "Sign it? (y/N) "
+
+#: 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: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: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: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: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: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: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:750
+#, c-format
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "“%s” was already signed by key %s\n"
+
+#: 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:777
+#, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Nothing to sign with key %s\n"
+
+#: g10/keyedit.c:801
+msgid "This key has expired!"
+msgstr "This key has expired!"
+
+#: 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: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: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:871
+#, c-format
+msgid " (0) I will not answer.%s\n"
+msgstr " (0) I will not answer.%s\n"
+
+#: 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:875
+#, c-format
+msgid " (2) I have done casual checking.%s\n"
+msgstr " (2) I have done casual checking.%s\n"
+
+#: 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:885
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Your selection? (enter ‘?’ for more information): "
+
+#: 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:920
+msgid "This will be a self-signature.\n"
+msgstr "This will be a self-signature.\n"
+
+#: 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: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:942
+msgid "The signature will be marked as non-exportable.\n"
+msgstr "The signature will be marked as non-exportable.\n"
+
+#: 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:956
+msgid "I have not checked this key at all.\n"
+msgstr "I have not checked this key at all.\n"
+
+#: g10/keyedit.c:961
+msgid "I have checked this key casually.\n"
+msgstr "I have checked this key casually.\n"
+
+#: 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:978
+msgid "Really sign? (y/N) "
+msgstr "Really sign? (y/N) "
+
+#: g10/keyedit.c:1029 g10/keyedit.c:5881 g10/keyedit.c:5964 g10/keyedit.c:6093
+#: g10/keyedit.c:6155 g10/sign.c:357
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "signing failed: %s\n"
+
+#: 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:1146
+#, c-format
+msgid "key %s: error changing passphrase: %s\n"
+msgstr "key %s: error changing passphrase: %s\n"
+
+#: g10/keyedit.c:1258
+msgid "save and quit"
+msgstr "save and quit"
+
+#: g10/keyedit.c:1261
+msgid "show key fingerprint"
+msgstr "show key fingerprint"
+
+#: g10/keyedit.c:1262
+msgid "show the keygrip"
+msgstr "show the keygrip"
+
+#: g10/keyedit.c:1263
+msgid "list key and user IDs"
+msgstr "list key and user IDs"
+
+#: g10/keyedit.c:1265
+msgid "select user ID N"
+msgstr "select user ID N"
+
+#: g10/keyedit.c:1266
+msgid "select subkey N"
+msgstr "select subkey N"
+
+#: g10/keyedit.c:1267
+msgid "check signatures"
+msgstr "check signatures"
+
+#: g10/keyedit.c:1273
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr "sign selected user IDs [* see below for related commands]"
+
+#: g10/keyedit.c:1278
+msgid "sign selected user IDs locally"
+msgstr "sign selected user IDs locally"
+
+#: g10/keyedit.c:1279
+msgid "sign selected user IDs with a trust signature"
+msgstr "sign selected user IDs with a trust signature"
+
+#: g10/keyedit.c:1281
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr "sign selected user IDs with a non-revocable signature"
+
+#: g10/keyedit.c:1283
+msgid "add a user ID"
+msgstr "add a user ID"
+
+#: g10/keyedit.c:1285
+msgid "add a photo ID"
+msgstr "add a photo ID"
+
+#: g10/keyedit.c:1286
+msgid "delete selected user IDs"
+msgstr "delete selected user IDs"
+
+#: g10/keyedit.c:1289
+msgid "add a subkey"
+msgstr "add a subkey"
+
+#: g10/keyedit.c:1292
+msgid "add a key to a smartcard"
+msgstr "add a key to a smartcard"
+
+#: g10/keyedit.c:1294
+msgid "move a key to a smartcard"
+msgstr "move a key to a smartcard"
+
+#: g10/keyedit.c:1296
+msgid "move a backup key to a smartcard"
+msgstr "move a backup key to a smartcard"
+
+#: g10/keyedit.c:1298
+msgid "delete selected subkeys"
+msgstr "delete selected subkeys"
+
+#: g10/keyedit.c:1300
+msgid "add a revocation key"
+msgstr "add a revocation key"
+
+#: g10/keyedit.c:1302
+msgid "delete signatures from the selected user IDs"
+msgstr "delete signatures from the selected user IDs"
+
+#: g10/keyedit.c:1304
+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:1306
+msgid "flag the selected user ID as primary"
+msgstr "flag the selected user ID as primary"
+
+#: g10/keyedit.c:1309
+msgid "list preferences (expert)"
+msgstr "list preferences (expert)"
+
+#: g10/keyedit.c:1310
+msgid "list preferences (verbose)"
+msgstr "list preferences (verbose)"
+
+#: g10/keyedit.c:1312
+msgid "set preference list for the selected user IDs"
+msgstr "set preference list for the selected user IDs"
+
+#: g10/keyedit.c:1315
+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:1317
+msgid "set a notation for the selected user IDs"
+msgstr "set a notation for the selected user IDs"
+
+#: g10/keyedit.c:1319
+msgid "change the passphrase"
+msgstr "change the passphrase"
+
+#: g10/keyedit.c:1322
+msgid "change the ownertrust"
+msgstr "change the ownertrust"
+
+#: g10/keyedit.c:1325
+msgid "revoke signatures on the selected user IDs"
+msgstr "revoke signatures on the selected user IDs"
+
+#: g10/keyedit.c:1327
+msgid "revoke selected user IDs"
+msgstr "revoke selected user IDs"
+
+#: g10/keyedit.c:1330
+msgid "revoke key or selected subkeys"
+msgstr "revoke key or selected subkeys"
+
+#: g10/keyedit.c:1332
+msgid "enable key"
+msgstr "enable key"
+
+#: g10/keyedit.c:1333
+msgid "disable key"
+msgstr "disable key"
+
+#: g10/keyedit.c:1335
+msgid "show selected photo IDs"
+msgstr "show selected photo IDs"
+
+#: g10/keyedit.c:1337
+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:1339
+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:1459
+msgid "Secret key is available.\n"
+msgstr "Secret key is available.\n"
+
+#: g10/keyedit.c:1461
+msgid "Secret subkeys are available.\n"
+msgstr "Secret subkeys are available.\n"
+
+#: g10/keyedit.c:1563
+msgid "Need the secret key to do this.\n"
+msgstr "Need the secret key to do this.\n"
+
+#: g10/keyedit.c:1586
+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:1644 g10/keyedit.c:2662 g10/keyedit.c:2801 g10/keyedit.c:2869
+msgid "Key is revoked."
+msgstr "Key is revoked."
+
+#: g10/keyedit.c:1667
+msgid "Really sign all user IDs? (y/N) "
+msgstr "Really sign all user IDs? (y/N) "
+
+#: g10/keyedit.c:1671
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Really sign all text user IDs? (y/N) "
+
+#: g10/keyedit.c:1679
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Hint: Select the user IDs to sign\n"
+
+#: g10/keyedit.c:1690
+#, c-format
+msgid "Unknown signature type '%s'\n"
+msgstr "Unknown signature type ‘%s’\n"
+
+#: g10/keyedit.c:1714
+#, 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:1736 g10/keyedit.c:1760 g10/keyedit.c:1957
+msgid "You must select at least one user ID.\n"
+msgstr "You must select at least one user ID.\n"
+
+#: g10/keyedit.c:1738 g10/keyedit.c:1762 g10/keyedit.c:1919 g10/keyedit.c:1959
+#, c-format
+msgid "(Use the '%s' command.)\n"
+msgstr "(Use the ‘%s’ command.)\n"
+
+#: g10/keyedit.c:1741
+msgid "You can't delete the last user ID!\n"
+msgstr "You can't delete the last user ID!\n"
+
+#: g10/keyedit.c:1744
+msgid "Really remove all selected user IDs? (y/N) "
+msgstr "Really remove all selected user IDs? (y/N) "
+
+#: g10/keyedit.c:1745
+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:1802
+msgid "Really move the primary key? (y/N) "
+msgstr "Really move the primary key? (y/N) "
+
+#: g10/keyedit.c:1814 g10/keyedit.c:4532
+msgid "You must select exactly one key.\n"
+msgstr "You must select exactly one key.\n"
+
+#: g10/keyedit.c:1842
+msgid "Command expects a filename argument\n"
+msgstr "Command expects a filename argument\n"
+
+#: g10/keyedit.c:1863
+#, c-format
+msgid "Can't open '%s': %s\n"
+msgstr "Can't open '%s': %s\n"
+
+#: g10/keyedit.c:1882
+#, c-format
+msgid "Error reading backup key from '%s': %s\n"
+msgstr "Error reading backup key from '%s': %s\n"
+
+#: g10/keyedit.c:1917
+msgid "You must select at least one key.\n"
+msgstr "You must select at least one key.\n"
+
+#: g10/keyedit.c:1923
+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:1925
+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:1963
+msgid "Really revoke all selected user IDs? (y/N) "
+msgstr "Really revoke all selected user IDs? (y/N) "
+
+#: g10/keyedit.c:1964
+msgid "Really revoke this user ID? (y/N) "
+msgstr "Really revoke this user ID? (y/N) "
+
+#: g10/keyedit.c:1982
+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:1993
+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:1995
+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:2053
+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:2098
+msgid "Set preference list to:\n"
+msgstr "Set preference list to:\n"
+
+#: g10/keyedit.c:2105
+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:2107
+msgid "Really update the preferences? (y/N) "
+msgstr "Really update the preferences? (y/N) "
+
+#: g10/keyedit.c:2181
+msgid "Save changes? (y/N) "
+msgstr "Save changes? (y/N) "
+
+#: g10/keyedit.c:2185
+msgid "Quit without saving? (y/N) "
+msgstr "Quit without saving? (y/N) "
+
+#: g10/keyedit.c:2196 g10/keyedit.c:2206 g10/keyedit.c:2383 g10/keyedit.c:2457
+#: g10/keyedit.c:2528 g10/keyedit.c:2752 g10/keyedit.c:2817 g10/keyedit.c:2968
+#, c-format
+msgid "update failed: %s\n"
+msgstr "update failed: %s\n"
+
+#: g10/keyedit.c:2212 g10/keyedit.c:2757 g10/keyedit.c:2822 g10/keyedit.c:2975
+msgid "Key not changed so no update needed.\n"
+msgstr "Key not changed so no update needed.\n"
+
+#: g10/keyedit.c:2444
+msgid "cannot revoke the last valid user ID.\n"
+msgstr "cannot revoke the last valid user ID.\n"
+
+#: g10/keyedit.c:2471
+#, c-format
+msgid "revoking the user ID failed: %s\n"
+msgstr "revoking the user ID failed: %s\n"
+
+#: g10/keyedit.c:2537
+#, c-format
+msgid "setting the primary user ID failed: %s\n"
+msgstr "setting the primary user ID failed: %s\n"
+
+#: g10/keyedit.c:2568
+#, c-format
+msgid "\"%s\" is not a fingerprint\n"
+msgstr "“%s” is not a fingerprint\n"
+
+#: g10/keyedit.c:2597
+#, c-format
+msgid "\"%s\" is not the primary fingerprint\n"
+msgstr "“%s” is not the primary fingerprint\n"
+
+#: g10/keyedit.c:2733 g10/keyedit.c:2736
+#, c-format
+msgid "Invalid user ID '%s': %s\n"
+msgstr "Invalid user ID '%s': %s\n"
+
+#: g10/keyedit.c:2739
+msgid "No matching user IDs."
+msgstr "No matching user IDs."
+
+#: g10/keyedit.c:2739
+msgid "Nothing to sign.\n"
+msgstr "Nothing to sign.\n"
+
+#: g10/keyedit.c:2877
+#, c-format
+msgid "'%s' is not a valid expiration time\n"
+msgstr "‘%s’ is not a valid expiration time\n"
+
+#: g10/keyedit.c:2920
+#, c-format
+msgid "\"%s\" is not a proper fingerprint\n"
+msgstr "“%s” is not a proper fingerprint\n"
+
+#: g10/keyedit.c:2944
+#, c-format
+msgid "subkey \"%s\" not found\n"
+msgstr "subkey “%s” not found\n"
+
+#: g10/keyedit.c:3067
+msgid "Digest: "
+msgstr "Digest: "
+
+#: g10/keyedit.c:3124
+msgid "Features: "
+msgstr "Features: "
+
+#: g10/keyedit.c:3135
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
+#: g10/keyedit.c:3150 g10/keylist.c:375
+msgid "Preferred keyserver: "
+msgstr "Preferred keyserver: "
+
+#: g10/keyedit.c:3158 g10/keyedit.c:3159
+msgid "Notations: "
+msgstr "Notations: "
+
+#: g10/keyedit.c:3404
+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:3476
+#, 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:3500
+#, 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:3506
+msgid "(sensitive)"
+msgstr "(sensitive)"
+
+#: g10/keyedit.c:3548 g10/keyedit.c:3690 g10/keylist.c:263 g10/keyserver.c:538
+#, c-format
+msgid "created: %s"
+msgstr "created: %s"
+
+#: g10/keyedit.c:3551 g10/keylist.c:1938
+#, c-format
+msgid "revoked: %s"
+msgstr "revoked: %s"
+
+#: g10/keyedit.c:3553 g10/keylist.c:1944
+#, c-format
+msgid "expired: %s"
+msgstr "expired: %s"
+
+#: g10/keyedit.c:3555 g10/keyedit.c:3692 g10/keylist.c:265 g10/keylist.c:1950
+#: g10/keyserver.c:544
+#, c-format
+msgid "expires: %s"
+msgstr "expires: %s"
+
+#: g10/keyedit.c:3557
+#, c-format
+msgid "usage: %s"
+msgstr "usage: %s"
+
+#: g10/keyedit.c:3565 g10/keyedit.c:3585 g10/keylist.c:268
+msgid "card-no: "
+msgstr "card-no: "
+
+#: g10/keyedit.c:3624
+#, c-format
+msgid "trust: %s"
+msgstr "trust: %s"
+
+#: g10/keyedit.c:3628
+#, c-format
+msgid "validity: %s"
+msgstr "validity: %s"
+
+#: g10/keyedit.c:3635
+msgid "This key has been disabled"
+msgstr "This key has been disabled"
+
+#: g10/keyedit.c:3653
+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:3709 g10/keyedit.c:4140 g10/keyserver.c:548
+#: g10/mainproc.c:2109 g10/tofu.c:1787 g10/trust.c:437 g10/trust.c:747
+#: dirmngr/ocsp.c:705
+msgid "revoked"
+msgstr "revoked"
+
+#: g10/keyedit.c:3711 g10/keyedit.c:4142 g10/keyserver.c:552
+#: g10/mainproc.c:2111 g10/tofu.c:1792 g10/trust.c:124 g10/trust.c:749
+msgid "expired"
+msgstr "expired"
+
+#: g10/keyedit.c:3828
+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:3880
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr "WARNING: Your encryption subkey expires soon.\n"
+
+#: g10/keyedit.c:3881
+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:3940
+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:3945 g10/keyedit.c:4235
+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:3951
+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:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
+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:4068
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Delete this good signature? (y/N/q)"
+
+#: g10/keyedit.c:4078
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Delete this invalid signature? (y/N/q)"
+
+#: g10/keyedit.c:4082
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Delete this unknown signature? (y/N/q)"
+
+#: g10/keyedit.c:4089
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Really delete this self-signature? (y/N)"
+
+#: g10/keyedit.c:4105
+#, 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:4109
+msgid "Nothing deleted.\n"
+msgstr "Nothing deleted.\n"
+
+#: g10/keyedit.c:4144 g10/trust.c:751
+msgid "invalid"
+msgstr "invalid"
+
+#: g10/keyedit.c:4146
+#, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID “%s” compacted: %s\n"
+
+#: g10/keyedit.c:4152
+#, 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:4160
+#, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID “%s”: already minimized\n"
+
+#: g10/keyedit.c:4161
+#, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "User ID “%s”: already clean\n"
+
+#: g10/keyedit.c:4230
+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:4241
+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:4258
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Enter the user ID of the designated revoker: "
+
+#: g10/keyedit.c:4283
+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:4298
+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:4320
+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:4338
+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:4344
+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:4412
+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:4417
+msgid "Changing expiration time for a subkey.\n"
+msgstr "Changing expiration time for a subkey.\n"
+
+#: g10/keyedit.c:4420
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Changing expiration time for the primary key.\n"
+
+#: g10/keyedit.c:4476
+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:4655
+#, c-format
+msgid "signing subkey %s is already cross-certified\n"
+msgstr "signing subkey %s is already cross-certified\n"
+
+#: g10/keyedit.c:4661
+#, 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:4778
+msgid "Please select exactly one user ID.\n"
+msgstr "Please select exactly one user ID.\n"
+
+#: g10/keyedit.c:4819 g10/keyedit.c:4933 g10/keyedit.c:5046 g10/keyedit.c:5184
+#, 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:4990
+msgid "Enter your preferred keyserver URL: "
+msgstr "Enter your preferred keyserver URL: "
+
+#: g10/keyedit.c:5069
+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:5070
+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:5130
+msgid "Enter the notation: "
+msgstr "Enter the notation: "
+
+#: g10/keyedit.c:5277
+msgid "Proceed? (y/N) "
+msgstr "Proceed? (y/N) "
+
+#: g10/keyedit.c:5347
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "No user ID with index %d\n"
+
+#: g10/keyedit.c:5409
+#, c-format
+msgid "No user ID with hash %s\n"
+msgstr "No user ID with hash %s\n"
+
+#: g10/keyedit.c:5510
+#, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "No subkey with key ID '%s'.\n"
+
+#: g10/keyedit.c:5532
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "No subkey with index %d\n"
+
+#: g10/keyedit.c:5673
+#, c-format
+msgid "user ID: \"%s\"\n"
+msgstr "user ID: “%s”\n"
+
+#: g10/keyedit.c:5676 g10/keyedit.c:5778 g10/keyedit.c:5826
+#, 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:5678 g10/keyedit.c:5780 g10/keyedit.c:5828
+msgid " (non-exportable)"
+msgstr " (non-exportable)"
+
+#: g10/keyedit.c:5682
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "This signature expired on %s.\n"
+
+#: g10/keyedit.c:5687
+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:5692
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Create a revocation certificate for this signature? (y/N) "
+
+#: g10/keyedit.c:5746
+msgid "Not signed by you.\n"
+msgstr "Not signed by you.\n"
+
+#: g10/keyedit.c:5752
+#, 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:5781
+msgid " (non-revocable)"
+msgstr " (non-revocable)"
+
+#: g10/keyedit.c:5788
+#, c-format
+msgid "revoked by your key %s on %s\n"
+msgstr "revoked by your key %s on %s\n"
+
+#: g10/keyedit.c:5813
+msgid "You are about to revoke these signatures:\n"
+msgstr "You are about to revoke these signatures:\n"
+
+#: g10/keyedit.c:5836
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Really create the revocation certificates? (y/N) "
+
+#: g10/keyedit.c:5869
+msgid "no secret key\n"
+msgstr "no secret key\n"
+
+#: g10/keyedit.c:5917
+#, 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:5927
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "user ID “%s” is already revoked\n"
+
+#: g10/keyedit.c:5944
+#, 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:6040
+msgid "Cannot revoke the last valid user ID.\n"
+msgstr "Cannot revoke the last valid user ID.\n"
+
+#: g10/keyedit.c:6078
+#, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Key %s is already revoked.\n"
+
+#: g10/keyedit.c:6140
+#, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Subkey %s is already revoked.\n"
+
+#: g10/keyedit.c:6237
+#, 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:169
+#, c-format
+msgid "invalid value for option '%s'\n"
+msgstr "invalid value for option ‘%s’\n"
+
+#: g10/keygen.c:318
+#, c-format
+msgid "preference '%s' duplicated\n"
+msgstr "preference ‘%s’ duplicated\n"
+
+#: g10/keygen.c:325
+msgid "too many cipher preferences\n"
+msgstr "too many cipher preferences\n"
+
+#: g10/keygen.c:327
+msgid "too many digest preferences\n"
+msgstr "too many digest preferences\n"
+
+#: g10/keygen.c:329
+msgid "too many compression preferences\n"
+msgstr "too many compression preferences\n"
+
- #: g10/keygen.c:472
++#: g10/keygen.c:489
+#, c-format
+msgid "invalid item '%s' in preference string\n"
+msgstr "invalid item ‘%s’ in preference string\n"
+
- #: g10/keygen.c:951
++#: g10/keygen.c:968
+msgid "writing direct signature\n"
+msgstr "writing direct signature\n"
+
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
+msgid "writing self signature\n"
+msgstr "writing self signature\n"
+
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
+msgid "writing key binding signature\n"
+msgstr "writing key binding signature\n"
+
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "keysize invalid; using %u bits\n"
+
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "keysize rounded up to %u bits\n"
+
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
+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:1695
++#: g10/keygen.c:1712
+msgid "Sign"
+msgstr "Sign"
+
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
+msgid "Certify"
+msgstr "Certify"
+
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
+msgid "Encrypt"
+msgstr "Encrypt"
+
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
+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:1723
++#: g10/keygen.c:1740
+msgid "SsEeAaQq"
+msgstr "SsEeAaQq"
+
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
+#, c-format
+msgid "Possible actions for a %s key: "
+msgstr "Possible actions for a %s key: "
+
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
+msgid "Current allowed actions: "
+msgstr "Current allowed actions: "
+
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
+#, c-format
+msgid " (%c) Toggle the sign capability\n"
+msgstr " (%c) Toggle the sign capability\n"
+
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
+#, c-format
+msgid " (%c) Toggle the encrypt capability\n"
+msgstr " (%c) Toggle the encrypt capability\n"
+
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
+#, c-format
+msgid " (%c) Toggle the authenticate capability\n"
+msgstr " (%c) Toggle the authenticate capability\n"
+
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
+#, c-format
+msgid " (%c) Finished\n"
+msgstr " (%c) Finished\n"
+
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 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:1887
++#: g10/keygen.c:1904
+#, c-format
+msgid " (%d) RSA and RSA (default)\n"
+msgstr " (%d) RSA and RSA (default)\n"
+
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
+#, c-format
+msgid " (%d) DSA and Elgamal\n"
+msgstr " (%d) DSA and Elgamal\n"
+
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
+#, c-format
+msgid " (%d) DSA (sign only)\n"
+msgstr " (%d) DSA (sign only)\n"
+
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
+#, c-format
+msgid " (%d) RSA (sign only)\n"
+msgstr " (%d) RSA (sign only)\n"
+
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
+#, c-format
+msgid " (%d) Elgamal (encrypt only)\n"
+msgstr " (%d) Elgamal (encrypt only)\n"
+
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
+#, c-format
+msgid " (%d) RSA (encrypt only)\n"
+msgstr " (%d) RSA (encrypt only)\n"
+
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
+#, c-format
+msgid " (%d) DSA (set your own capabilities)\n"
+msgstr " (%d) DSA (set your own capabilities)\n"
+
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
+#, c-format
+msgid " (%d) RSA (set your own capabilities)\n"
+msgstr " (%d) RSA (set your own capabilities)\n"
+
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
+#, c-format
+msgid " (%d) ECC and ECC\n"
+msgstr " (%d) ECC and ECC\n"
+
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
+#, c-format
+msgid " (%d) ECC (sign only)\n"
+msgstr " (%d) ECC (sign only)\n"
+
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
+#, c-format
+msgid " (%d) ECC (set your own capabilities)\n"
+msgstr " (%d) ECC (set your own capabilities)\n"
+
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
+#, c-format
+msgid " (%d) ECC (encrypt only)\n"
+msgstr " (%d) ECC (encrypt only)\n"
+
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
+#, c-format
+msgid " (%d) Existing key\n"
+msgstr " (%d) Existing key\n"
+
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
+msgid "Enter the keygrip: "
+msgstr "Enter the keygrip: "
+
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 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:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
+msgid "No key with this keygrip\n"
+msgstr "No key with this keygrip\n"
+
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
+#, c-format
+msgid "rounded to %u bits\n"
+msgstr "rounded to %u bits\n"
+
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
+#, 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:2186
++#: g10/keygen.c:2203
+#, 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:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
+#, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "What keysize do you want? (%u) "
+
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Requested keysize is %u bits\n"
+
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
+msgid "Please select which elliptic curve you want:\n"
+msgstr "Please select which elliptic curve you want:\n"
+
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
+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:2432
++#: g10/keygen.c:2449
+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:2455
++#: g10/keygen.c:2472
+msgid "Key is valid for? (0) "
+msgstr "Key is valid for? (0) "
+
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
+#, c-format
+msgid "Signature is valid for? (%s) "
+msgstr "Signature is valid for? (%s) "
+
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
+msgid "invalid value\n"
+msgstr "invalid value\n"
+
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
+msgid "Key does not expire at all\n"
+msgstr "Key does not expire at all\n"
+
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
+msgid "Signature does not expire at all\n"
+msgstr "Signature does not expire at all\n"
+
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
+#, c-format
+msgid "Key expires at %s\n"
+msgstr "Key expires at %s\n"
+
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
+#, c-format
+msgid "Signature expires at %s\n"
+msgstr "Signature expires at %s\n"
+
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
+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:2504
++#: g10/keygen.c:2521
+msgid "Is this correct? (y/N) "
+msgstr "Is this correct? (y/N) "
+
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
+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:2587
++#: g10/keygen.c:2604
+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:2606
++#: g10/keygen.c:2623
+msgid "Real name: "
+msgstr "Real name: "
+
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
+msgid "Invalid character in name\n"
+msgstr "Invalid character in name\n"
+
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
+#, 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:2620
++#: g10/keygen.c:2637
+msgid "Name may not start with a digit\n"
+msgstr "Name may not start with a digit\n"
+
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
+msgid "Name must be at least 5 characters long\n"
+msgstr "Name must be at least 5 characters long\n"
+
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
+msgid "Email address: "
+msgstr "Email address: "
+
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
+msgid "Not a valid email address\n"
+msgstr "Not a valid email address\n"
+
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
+msgid "Comment: "
+msgstr "Comment: "
+
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
+msgid "Invalid character in comment\n"
+msgstr "Invalid character in comment\n"
+
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
+#, c-format
+msgid "You are using the '%s' character set.\n"
+msgstr "You are using the ‘%s’ character set.\n"
+
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
+#, 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:2701
++#: g10/keygen.c:2718
+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:2726
++#: g10/keygen.c:2743
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoQq"
+
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
+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:2737
++#: g10/keygen.c:2754
+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:2742
++#: g10/keygen.c:2759
+msgid "Change (N)ame, (E)mail, or (Q)uit? "
+msgstr "Change (N)ame, (E)mail, or (Q)uit? "
+
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
+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:2762
++#: g10/keygen.c:2779
+msgid "Please correct the error first\n"
+msgstr "Please correct the error first\n"
+
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
+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:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Key generation failed: %s\n"
+
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
+#, 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:3924
++#: g10/keygen.c:3941
+msgid "Continue? (Y/n) "
+msgstr "Continue? (Y/n) "
+
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
+#, c-format
+msgid "A key for \"%s\" already exists\n"
+msgstr "A key for “%s” already exists\n"
+
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
+msgid "Create anyway? (y/N) "
+msgstr "Create anyway? (y/N) "
+
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
+msgid "creating anyway\n"
+msgstr "creating anyway\n"
+
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
+#, 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:4387
++#: g10/keygen.c:4404
+msgid "Key generation canceled.\n"
+msgstr "Key generation canceled.\n"
+
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
+#, c-format
+msgid "can't create backup file '%s': %s\n"
+msgstr "can't create backup file '%s': %s\n"
+
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
+#, 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:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
+#, c-format
+msgid "writing public key to '%s'\n"
+msgstr "writing public key to ‘%s’\n"
+
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "no writable public keyring found: %s\n"
+
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
+#, c-format
+msgid "error writing public keyring '%s': %s\n"
+msgstr "error writing public keyring '%s': %s\n"
+
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
+msgid "public and secret key created and signed.\n"
+msgstr "public and secret key created and signed.\n"
+
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
+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:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
+#, 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:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
+#, 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:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
+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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Secret parts of primary key are not available.\n"
+
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
+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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
+msgid "Really create? (y/N) "
+msgstr "Really create? (y/N) "
+
+#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
+msgid "never "
+msgstr "never "
+
+#: g10/keylist.c:331
+msgid "Critical signature policy: "
+msgstr "Critical signature policy: "
+
+#: g10/keylist.c:333
+msgid "Signature policy: "
+msgstr "Signature policy: "
+
+#: g10/keylist.c:373
+msgid "Critical preferred keyserver: "
+msgstr "Critical preferred keyserver: "
+
+#: g10/keylist.c:426
+msgid "Critical signature notation: "
+msgstr "Critical signature notation: "
+
+#: g10/keylist.c:428
+msgid "Signature notation: "
+msgstr "Signature notation: "
+
+#: 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: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: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:591
+msgid "Keyring"
+msgstr "Keyring"
+
+#: g10/keylist.c:1805
+msgid "Primary key fingerprint:"
+msgstr "Primary key fingerprint:"
+
+#: 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:1815
+msgid " Primary key fingerprint:"
+msgstr " Primary key fingerprint:"
+
+#: g10/keylist.c:1817 g10/keylist.c:1827
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
+#: g10/keylist.c:1822 g10/keylist.c:1838
+msgid " Key fingerprint ="
+msgstr " Key fingerprint ="
+
+#: 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:1709
+#, c-format
+msgid "requesting key %s from %s server %s\n"
+msgstr "requesting key %s from %s server %s\n"
+
+#: g10/keyserver.c:1713
+#, c-format
+msgid "requesting key %s from %s\n"
+msgstr "requesting key %s from %s\n"
+
+#: g10/keyserver.c:1818 g10/keyserver.c:1996
+msgid "no keyserver known\n"
+msgstr "no keyserver known\n"
+
+#: 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:1836
+#, c-format
+msgid "sending key %s to %s\n"
+msgstr "sending key %s to %s\n"
+
+#: g10/keyserver.c:1877
+#, c-format
+msgid "requesting key from '%s'\n"
+msgstr "requesting key from ‘%s’\n"
+
+#: 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: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:303
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s encrypted session key\n"
+
+#: 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:379
+#, c-format
+msgid "public key is %s\n"
+msgstr "public key is %s\n"
+
+#: g10/mainproc.c:457
+msgid "public key encrypted data: good DEK\n"
+msgstr "public key encrypted data: good DEK\n"
+
+#: 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:494 g10/pkclist.c:228
+#, c-format
+msgid " \"%s\"\n"
+msgstr " “%s”\n"
+
+#: 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:515
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "public key decryption failed: %s\n"
+
+#: g10/mainproc.c:531
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "encrypted with %lu passphrases\n"
+
+#: g10/mainproc.c:533
+msgid "encrypted with 1 passphrase\n"
+msgstr "encrypted with 1 passphrase\n"
+
+#: 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: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:659 g10/mainproc.c:673
+msgid "WARNING: message was not integrity protected\n"
+msgstr "WARNING: message was not integrity protected\n"
+
+#: g10/mainproc.c:669
+msgid "decryption okay\n"
+msgstr "decryption okay\n"
+
+#: g10/mainproc.c:678
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "WARNING: encrypted message has been manipulated!\n"
+
+#: g10/mainproc.c:695
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "decryption failed: %s\n"
+
+#: 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:720
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "original file name='%.*s'\n"
+
+#: g10/mainproc.c:790
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr "WARNING: multiple plaintexts seen\n"
+
+#: 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:1265 g10/mainproc.c:1308
+msgid "no signature found\n"
+msgstr "no signature found\n"
+
+#: g10/mainproc.c:1642
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "BAD signature from “%s”"
+
+#: g10/mainproc.c:1644
+#, c-format
+msgid "Expired signature from \"%s\""
+msgstr "Expired signature from “%s”"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Good signature from “%s”"
+
+#: g10/mainproc.c:1666
+msgid "signature verification suppressed\n"
+msgstr "signature verification suppressed\n"
+
+#: 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:1789 g10/mainproc.c:1797
+#, c-format
+msgid "Signature made %s\n"
+msgstr "Signature made %s\n"
+
+#: 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: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:1808
+#, c-format
+msgid " issuer \"%s\"\n"
+msgstr " issuer “%s”\n"
+
+#: g10/mainproc.c:1825
+msgid "Key available at: "
+msgstr "Key available at: "
+
+#: g10/mainproc.c:2063
+msgid "[uncertain]"
+msgstr "[uncertain]"
+
+#: g10/mainproc.c:2101
+#, c-format
+msgid " aka \"%s\""
+msgstr " aka “%s”"
+
+#: 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:2198
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Signature expires %s\n"
+
+#: 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:2210
+msgid "binary"
+msgstr "binary"
+
+#: g10/mainproc.c:2211
+msgid "textmode"
+msgstr "textmode"
+
+#: g10/mainproc.c:2211 g10/trust.c:123 dirmngr/ocsp.c:706
+msgid "unknown"
+msgstr "unknown"
+
+#: g10/mainproc.c:2213
+msgid ", key algorithm "
+msgstr ", key algorithm "
+
+#: 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:2287
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Can't check signature: %s\n"
+
+#: 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: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:2442
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "standalone signature of class 0x%02x\n"
+
+#: 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:1059
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: deprecated option “%s”\n"
+
+#: 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:1065
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "please use “%s%s” instead\n"
+
+#: 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: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: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:1150
+msgid "Uncompressed"
+msgstr "Uncompressed"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:1175
+msgid "uncompressed|none"
+msgstr "uncompressed|none"
+
+#: 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:1457
+#, c-format
+msgid "ambiguous option '%s'\n"
+msgstr "ambiguous option ‘%s’\n"
+
+#: g10/misc.c:1482
+#, c-format
+msgid "unknown option '%s'\n"
+msgstr "unknown option ‘%s’\n"
+
+#: 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: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:763
++#: g10/pkclist.c:72 g10/revoke.c:776
+msgid "No reason specified"
+msgstr "No reason specified"
+
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
+msgid "Key is superseded"
+msgstr "Key is superseded"
+
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
+msgid "Key has been compromised"
+msgstr "Key has been compromised"
+
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
+msgid "Key is no longer used"
+msgstr "Key is no longer used"
+
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
+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:792
++#: g10/pkclist.c:310 g10/revoke.c:805
+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:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: skipped: %s\n"
+
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: skipped: public key is disabled\n"
+
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: skipped: public key already present\n"
+
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
+#, c-format
+msgid "can't encrypt to '%s'\n"
+msgstr "can't encrypt to ‘%s’\n"
+
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
+#, 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:1012
++#: g10/pkclist.c:1007
+#, 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:1115
++#: g10/pkclist.c:1110
+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:1139
++#: g10/pkclist.c:1134
+msgid "Current recipients:\n"
+msgstr "Current recipients:\n"
+
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
+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:1189
++#: g10/pkclist.c:1184
+msgid "No such user ID.\n"
+msgstr "No such user ID.\n"
+
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
+msgid "skipped: public key already set as default recipient\n"
+msgstr "skipped: public key already set as default recipient\n"
+
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
+msgid "Public key is disabled.\n"
+msgstr "Public key is disabled.\n"
+
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
+msgid "skipped: public key already set\n"
+msgstr "skipped: public key already set\n"
+
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
+#, c-format
+msgid "unknown default recipient \"%s\"\n"
+msgstr "unknown default recipient “%s”\n"
+
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
+msgid "no valid addressees\n"
+msgstr "no valid addressees\n"
+
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
+#, c-format
+msgid "Note: key %s has no %s feature\n"
+msgstr "Note: key %s has no %s feature\n"
+
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
+#, 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:98 g10/pubkey-enc.c:139 sm/decrypt.c:493
+#, c-format
+msgid "key %s is not suitable for decryption in %s mode\n"
+msgstr "key %s is not suitable for decryption in %s mode\n"
+
+#: g10/pubkey-enc.c:131
+#, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "anonymous recipient; trying secret key %s ...\n"
+
+#: g10/pubkey-enc.c:150
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "okay, we are the anonymous recipient.\n"
+
+#: g10/pubkey-enc.c:310
+msgid "old encoding of the DEK is not supported\n"
+msgstr "old encoding of the DEK is not supported\n"
+
+#: g10/pubkey-enc.c:338
+#, 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:382
+#, 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:415
+#, c-format
+msgid "Note: secret key %s expired at %s\n"
+msgstr "Note: secret key %s expired at %s\n"
+
+#: g10/pubkey-enc.c:422
+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:733
++#: g10/revoke.c:335 g10/revoke.c:746
+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:552
++#: g10/revoke.c:565
+msgid "This is a revocation certificate for the OpenPGP key:"
+msgstr "This is a revocation certificate for the OpenPGP key:"
+
- #: g10/revoke.c:568
++#: g10/revoke.c:581
+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:571
++#: g10/revoke.c:584
+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:577
++#: g10/revoke.c:590
+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:596
++#: g10/revoke.c:609
+#, c-format
+msgid "revocation certificate stored as '%s.rev'\n"
+msgstr "revocation certificate stored as ‘%s.rev’\n"
+
- #: g10/revoke.c:640
++#: g10/revoke.c:653
+#, 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:667
++#: g10/revoke.c:680
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr "‘%s’ matches multiple secret keys:\n"
+
- #: g10/revoke.c:694
++#: g10/revoke.c:707
+#, c-format
+msgid "error searching the keyring: %s\n"
+msgstr "error searching the keyring: %s\n"
+
- #: g10/revoke.c:717
++#: g10/revoke.c:730
+msgid "Create a revocation certificate for this key? (y/N) "
+msgstr "Create a revocation certificate for this key? (y/N) "
+
- #: g10/revoke.c:741
++#: g10/revoke.c:754
+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:775
++#: g10/revoke.c:788
+msgid "Please select the reason for the revocation:\n"
+msgstr "Please select the reason for the revocation:\n"
+
- #: g10/revoke.c:785
++#: g10/revoke.c:798
+msgid "Cancel"
+msgstr "Cancel"
+
- #: g10/revoke.c:787
++#: g10/revoke.c:800
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Probably you want to select %d here)\n"
+
- #: g10/revoke.c:828
++#: g10/revoke.c:841
+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:856
++#: g10/revoke.c:869
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Reason for revocation: %s\n"
+
- #: g10/revoke.c:858
++#: g10/revoke.c:871
+msgid "(No description given)\n"
+msgstr "(No description given)\n"
+
- #: g10/revoke.c:863
++#: g10/revoke.c:876
+msgid "Is this okay? (y/N) "
+msgstr "Is this okay? (y/N) "
+
+#: 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:153
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "WARNING: signature digest conflict in message\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 "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:193
+#, c-format
+msgid "please see %s for more information\n"
+msgstr "please see %s for more information\n"
+
+#: 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: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: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: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: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:373
+#, c-format
+msgid "Note: signature key %s expired %s\n"
+msgstr "Note: signature key %s expired %s\n"
+
+#: 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: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:1118
+#, 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:1121
+#, 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: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: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: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:363
+#, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s/%s signature from: “%s”\n"
+
+#: 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:1053
+msgid "signing:"
+msgstr "signing:"
+
+#: g10/sign.c:1330
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "%s encryption will be used\n"
+
+#: 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:205
+#, c-format
+msgid "skipped \"%s\": duplicated\n"
+msgstr "skipped “%s”: duplicated\n"
+
+#: g10/skclist.c:224
+msgid "skipped: secret key already present\n"
+msgstr "skipped: secret key already present\n"
+
+#: 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: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: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: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: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:504
+#, c-format
+msgid "unsupported TOFU database version: %s\n"
+msgstr "unsupported TOFU database version: %s\n"
+
+#: 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: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: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
++#: g10/tofu.c:3408
+#, c-format
+msgid "error reading TOFU database: %s\n"
+msgstr "error reading TOFU database: %s\n"
+
+#: 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: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:843
+#, c-format
+msgid "error creating 'encryptions' TOFU table: %s\n"
+msgstr "error creating ‘encryptions’ TOFU table: %s\n"
+
+#: 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:955
+#, c-format
+msgid "error opening TOFU database '%s': %s\n"
+msgstr "error opening TOFU database '%s': %s\n"
+
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
+#, c-format
+msgid "error updating TOFU database: %s\n"
+msgstr "error updating TOFU database: %s\n"
+
+#: 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: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: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: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:1608
+#, c-format
+msgid "error gathering other user IDs: %s\n"
+msgstr "error gathering other user IDs: %s\n"
+
+#: g10/tofu.c:1618
+msgid "This key's user IDs:\n"
+msgstr "This key's user IDs:\n"
+
+#: g10/tofu.c:1634 g10/tofu.c:1799
+#, c-format
+msgid "policy: %s"
+msgstr "policy: %s"
+
+#: g10/tofu.c:1725
+#, c-format
+msgid "error gathering signature stats: %s\n"
+msgstr "error gathering signature stats: %s\n"
+
+#: 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: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:1797
+msgid "this key"
+msgstr "this key"
+
+#: 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: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: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: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: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: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: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: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: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: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:1898
+#, c-format
+msgid "Messages verified in the past: %d."
+msgstr "Messages verified in the past: %d."
+
+#: 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: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:1961
+msgid "gGaAuUrRbB"
+msgstr "gGaAuUrRbB"
+
+#: 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:1975
+msgid "Defaulting to unknown.\n"
+msgstr "Defaulting to unknown.\n"
+
+#: g10/tofu.c:2090 g10/tofu.c:2226
+msgid "TOFU db corruption detected.\n"
+msgstr "TOFU db corruption detected.\n"
+
+#: g10/tofu.c:2146
+#, c-format
+msgid "resetting keydb: %s\n"
+msgstr "resetting keydb: %s\n"
+
+#: 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:2826
+#, c-format
+msgid "error changing TOFU policy: %s\n"
+msgstr "error changing TOFU policy: %s\n"
+
+#: g10/tofu.c:2877
+#, c-format
+msgid "%lld~year"
+msgid_plural "%lld~years"
+msgstr[0] "%lld~year"
+msgstr[1] "%lld~years"
+
+#: g10/tofu.c:2882
+#, c-format
+msgid "%lld~month"
+msgid_plural "%lld~months"
+msgstr[0] "%lld~month"
+msgstr[1] "%lld~months"
+
+#: g10/tofu.c:2887
+#, c-format
+msgid "%lld~week"
+msgid_plural "%lld~weeks"
+msgstr[0] "%lld~week"
+msgstr[1] "%lld~weeks"
+
+#: g10/tofu.c:2892
+#, c-format
+msgid "%lld~day"
+msgid_plural "%lld~days"
+msgstr[0] "%lld~day"
+msgstr[1] "%lld~days"
+
+#: g10/tofu.c:2897
+#, c-format
+msgid "%lld~hour"
+msgid_plural "%lld~hours"
+msgstr[0] "%lld~hour"
+msgstr[1] "%lld~hours"
+
+#: g10/tofu.c:2902
+#, c-format
+msgid "%lld~minute"
+msgid_plural "%lld~minutes"
+msgstr[0] "%lld~minute"
+msgstr[1] "%lld~minutes"
+
+#: g10/tofu.c:2904
+#, c-format
+msgid "%lld~second"
+msgid_plural "%lld~seconds"
+msgstr[0] "%lld~second"
+msgstr[1] "%lld~seconds"
+
+#: 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:3148
+#, c-format
+msgid "%s: Verified 0 signatures."
+msgstr "%s: Verified 0 signatures."
+
+#: 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:3166
+msgid "Encrypted 0 messages."
+msgstr "Encrypted 0 messages."
+
+#: 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:3185
+#, c-format
+msgid "(policy: %s)"
+msgstr "(policy: %s)"
+
+#: 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: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: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: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: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: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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
+#, c-format
+msgid "error opening TOFU database: %s\n"
+msgstr "error opening TOFU database: %s\n"
+
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
+#, 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:3915
++#: g10/tofu.c:3943
+#, 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:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
+#, 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:1385
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "public key %s not found: %s\n"
+
+#: g10/trustdb.c:1018
+msgid "please do a --check-trustdb\n"
+msgstr "please do a --check-trustdb\n"
+
+#: g10/trustdb.c:1023
+msgid "checking the trustdb\n"
+msgstr "checking the trustdb\n"
+
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
+#, c-format
+msgid "%d key processed"
+msgid_plural "%d keys processed"
+msgstr[0] "%d key processed"
+msgstr[1] "%d keys processed"
+
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
+#, 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:2030
++#: g10/trustdb.c:2034
+msgid "no ultimately trusted keys found\n"
+msgstr "no ultimately trusted keys found\n"
+
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
+#, 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:2162
++#: g10/trustdb.c:2166
+#, 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:2243
++#: g10/trustdb.c:2247
+#, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "unable to update trustdb version record: write failed: %s\n"
+
+#: g10/trust.c:125
+msgid "undefined"
+msgstr "undefined"
+
+#: g10/trust.c:126
+msgid "never"
+msgstr "never"
+
+#: g10/trust.c:127
+msgid "marginal"
+msgstr "marginal"
+
+#: g10/trust.c:128
+msgid "full"
+msgstr "full"
+
+#: g10/trust.c:129
+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:166
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr "10 translator see trust.c:uid_trust_string_fixed"
+
+#: g10/trust.c:169
+msgid "[ revoked]"
+msgstr "[ revoked]"
+
+#: g10/trust.c:171 g10/trust.c:177
+msgid "[ expired]"
+msgstr "[ expired]"
+
+#: g10/trust.c:176
+msgid "[ unknown]"
+msgstr "[ unknown]"
+
+#: g10/trust.c:178
+msgid "[ undef ]"
+msgstr "[ undef ]"
+
+#: g10/trust.c:179
+msgid "[ never ]"
+msgstr "[ never ]"
+
+#: g10/trust.c:180
+msgid "[marginal]"
+msgstr "[marginal]"
+
+#: g10/trust.c:181
+msgid "[ full ]"
+msgstr "[ full ]"
+
+#: g10/trust.c:182
+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: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: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: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: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:818
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "failed to store the fingerprint: %s\n"
+
+#: 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:1190 scd/app-openpgp.c:2620 scd/app-openpgp.c:4753
+msgid "error retrieving CHV status from card\n"
+msgstr "error retrieving CHV status from card\n"
+
+#: 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: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: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: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: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:2008
+#, c-format
+msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
+msgstr "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s"
+
+#: 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:2037
+#, c-format
+msgid "Remaining attempts: %d"
+msgstr "Remaining attempts: %d"
+
+#: 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: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:2113
+msgid "||Please unlock the card"
+msgstr "||Please unlock the card"
+
+#: 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: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:2246 scd/app-openpgp.c:4762
+msgid "card is permanently locked!\n"
+msgstr "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"
+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:2260
+msgid "|A|Please enter the Admin PIN"
+msgstr "|A|Please enter the Admin PIN"
+
+#: 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:2586
+msgid "||Please enter the PIN"
+msgstr "||Please enter the PIN"
+
+#: 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: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:2668
+msgid "|RN|New Reset Code"
+msgstr "|RN|New Reset Code"
+
+#: scd/app-openpgp.c:2669
+msgid "|AN|New Admin PIN"
+msgstr "|AN|New Admin PIN"
+
+#: scd/app-openpgp.c:2669
+msgid "|N|New PIN"
+msgstr "|N|New PIN"
+
+#: 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:2741
+msgid "||Please enter the PIN and New PIN"
+msgstr "||Please enter the PIN and New PIN"
+
+#: 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:2803 scd/app-openpgp.c:4065
+msgid "error reading fingerprint DO\n"
+msgstr "error reading fingerprint DO\n"
+
+#: scd/app-openpgp.c:2813
+msgid "key already exists\n"
+msgstr "key already exists\n"
+
+#: scd/app-openpgp.c:2817
+msgid "existing key will be replaced\n"
+msgstr "existing key will be replaced\n"
+
+#: scd/app-openpgp.c:2819
+msgid "generating new key\n"
+msgstr "generating new key\n"
+
+#: scd/app-openpgp.c:2821
+msgid "writing new key\n"
+msgstr "writing new key\n"
+
+#: scd/app-openpgp.c:3363 scd/app-openpgp.c:3714
+msgid "creation timestamp missing\n"
+msgstr "creation timestamp missing\n"
+
+#: 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: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:3708
+msgid "unsupported curve\n"
+msgstr "unsupported curve\n"
+
+#: 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:3983
+msgid "generating key failed\n"
+msgstr "generating key failed\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] "key generation completed (%d second)\n"
+msgstr[1] "key generation completed (%d seconds)\n"
+
+#: 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: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: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:4274
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signatures created so far: %lu\n"
+
+#: scd/app-openpgp.c:4767
+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:5079 scd/app-openpgp.c:5090
+#, 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
++#: scd/scdaemon.c:115
+msgid "run in multi server mode (foreground)"
+msgstr "run in multi server mode (foreground)"
+
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr "|LEVEL|set the debugging level to LEVEL"
+
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
+msgid "|FILE|write a log to FILE"
+msgstr "|FILE|write a log to FILE"
+
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
+msgid "|N|connect to reader at port N"
+msgstr "|N|connect to reader at port N"
+
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
+msgid "|NAME|use NAME as ct-API driver"
+msgstr "|NAME|use NAME as ct-API driver"
+
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
+msgid "|NAME|use NAME as PC/SC driver"
+msgstr "|NAME|use NAME as PC/SC driver"
+
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
+msgid "do not use the internal CCID driver"
+msgstr "do not use the internal CCID driver"
+
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr "|N|disconnect the card after N seconds of inactivity"
+
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
+msgid "do not use a reader's pinpad"
+msgstr "do not use a reader's pinpad"
+
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
+msgid "deny the use of admin card commands"
+msgstr "deny the use of admin card commands"
+
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
+msgid "use variable length input for pinpad"
+msgstr "use variable length input for pinpad"
+
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
+msgid "Usage: @SCDAEMON@ [options] (-h for help)"
+msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
+
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
+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
++#: scd/scdaemon.c:803
+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:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr "handler for fd %d started\n"
+
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
+#, c-format
+msgid "handler for fd %d terminated\n"
+msgstr "handler for fd %d terminated\n"
+
+#: sm/call-dirmngr.c:268 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: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: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: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:341
+msgid "(this is the RC2 algorithm)\n"
+msgstr "(this is the RC2 algorithm)\n"
+
+#: 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:330
+msgid "no valid recipients given\n"
+msgstr "no valid recipients given\n"
+
+#: sm/gpgsm.c:210
+msgid "list external keys"
+msgstr "list external keys"
+
+#: sm/gpgsm.c:212
+msgid "list certificate chain"
+msgstr "list certificate chain"
+
+#: sm/gpgsm.c:220
+msgid "import certificates"
+msgstr "import certificates"
+
+#: sm/gpgsm.c:221
+msgid "export certificates"
+msgstr "export certificates"
+
+#: sm/gpgsm.c:229
+msgid "register a smartcard"
+msgstr "register a smartcard"
+
+#: sm/gpgsm.c:232
+msgid "pass a command to the dirmngr"
+msgstr "pass a command to the dirmngr"
+
+#: sm/gpgsm.c:234
+msgid "invoke gpg-protect-tool"
+msgstr "invoke gpg-protect-tool"
+
+#: sm/gpgsm.c:251
+msgid "create base-64 encoded output"
+msgstr "create base-64 encoded output"
+
+#: sm/gpgsm.c:259
+msgid "assume input is in PEM format"
+msgstr "assume input is in PEM format"
+
+#: sm/gpgsm.c:261
+msgid "assume input is in base-64 format"
+msgstr "assume input is in base-64 format"
+
+#: sm/gpgsm.c:263
+msgid "assume input is in binary format"
+msgstr "assume input is in binary format"
+
+#: sm/gpgsm.c:270
+msgid "never consult a CRL"
+msgstr "never consult a CRL"
+
+#: sm/gpgsm.c:280
+msgid "check validity using OCSP"
+msgstr "check validity using OCSP"
+
+#: sm/gpgsm.c:285
+msgid "|N|number of certificates to include"
+msgstr "|N|number of certificates to include"
+
+#: sm/gpgsm.c:288
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|take policy information from FILE"
+
+#: sm/gpgsm.c:291
+msgid "do not check certificate policies"
+msgstr "do not check certificate policies"
+
+#: sm/gpgsm.c:295
+msgid "fetch missing issuer certificates"
+msgstr "fetch missing issuer certificates"
+
+#: sm/gpgsm.c:306
+msgid "don't use the terminal at all"
+msgstr "don't use the terminal at all"
+
+#: 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:313
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|write an audit log to FILE"
+
+#: sm/gpgsm.c:316
+msgid "batch mode: never ask"
+msgstr "batch mode: never ask"
+
+#: sm/gpgsm.c:317
+msgid "assume yes on most questions"
+msgstr "assume yes on most questions"
+
+#: sm/gpgsm.c:318
+msgid "assume no on most questions"
+msgstr "assume no on most questions"
+
+#: 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:324
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|use USER-ID as default secret key"
+
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|use this keyserver to lookup keys"
+
+#: sm/gpgsm.c:351
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|use cipher algorithm NAME"
+
+#: sm/gpgsm.c:353
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|use message digest algorithm NAME"
+
+#: sm/gpgsm.c:560
+msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
+msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
+
+#: 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: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:778
+#, c-format
+msgid "unknown validation model '%s'\n"
+msgstr "unknown validation model ‘%s’\n"
+
+#: 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: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:869 dirmngr/ldapserver.c:126
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: skipping this line\n"
+
+#: sm/gpgsm.c:1431
+msgid "could not parse keyserver\n"
+msgstr "could not parse keyserver\n"
+
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
+#, c-format
+msgid "importing common certificates '%s'\n"
+msgstr "importing common certificates ‘%s’\n"
+
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
+#, c-format
+msgid "can't sign using '%s': %s\n"
+msgstr "can't sign using '%s': %s\n"
+
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
+msgid "invalid command (there is no implicit command)\n"
+msgstr "invalid command (there is no implicit command)\n"
+
+#: sm/import.c:127
+#, c-format
+msgid "total number processed: %lu\n"
+msgstr "total number processed: %lu\n"
+
+#: sm/import.c:246
+msgid "error storing certificate\n"
+msgstr "error storing certificate\n"
+
+#: sm/import.c:254
+msgid "basic certificate checks failed - not imported\n"
+msgstr "basic certificate checks failed - not imported\n"
+
+#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
+#, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "error getting stored flags: %s\n"
+
+#: sm/import.c:531 sm/import.c:563
+#, c-format
+msgid "error importing certificate: %s\n"
+msgstr "error importing certificate: %s\n"
+
+#: sm/import.c:751 tools/gpg-connect-agent.c:1433
+#, c-format
+msgid "error reading input: %s\n"
+msgstr "error reading input: %s\n"
+
+#: sm/keydb.c:1126 sm/keydb.c:1212
+msgid "failed to get the fingerprint\n"
+msgstr "failed to get the fingerprint\n"
+
+#: sm/keydb.c:1168
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr "problem looking for existing certificate: %s\n"
+
+#: sm/keydb.c:1180
+#, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "error finding writable keyDB: %s\n"
+
+#: sm/keydb.c:1188
+#, c-format
+msgid "error storing certificate: %s\n"
+msgstr "error storing certificate: %s\n"
+
+#: sm/keydb.c:1240
+#, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "problem re-searching certificate: %s\n"
+
+#: sm/keydb.c:1261 sm/keydb.c:1350
+#, c-format
+msgid "error storing flags: %s\n"
+msgstr "error storing flags: %s\n"
+
+#: sm/keylist.c:669
+msgid "Error - "
+msgstr "Error - "
+
+#: sm/misc.c:58
+msgid "GPG_TTY has not been set - using maybe bogus default\n"
+msgstr "GPG_TTY has not been set - using maybe bogus default\n"
+
+#: sm/qualified.c:105
+#, c-format
+msgid "invalid formatted fingerprint in '%s', line %d\n"
+msgstr "invalid formatted fingerprint in '%s', line %d\n"
+
+#: sm/qualified.c:123
+#, c-format
+msgid "invalid country code in '%s', line %d\n"
+msgstr "invalid country code in '%s', line %d\n"
+
+#: sm/qualified.c:206
+#, c-format
+msgid ""
+"You are about to create a signature using your certificate:\n"
+"\"%s\"\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+msgstr ""
+"You are about to create a signature using your certificate:\n"
+"“%s”\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
+"\n"
+"%s%sAre you really sure that you want to do this?"
+
+#: sm/qualified.c:215 sm/verify.c: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: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: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:560
+#, c-format
+msgid "checking for qualified certificate failed: %s\n"
+msgstr "checking for qualified certificate failed: %s\n"
+
+#: sm/verify.c:486
+msgid "Signature made "
+msgstr "Signature made "
+
+#: sm/verify.c:490
+msgid "[date not given]"
+msgstr "[date not given]"
+
+#: sm/verify.c:491
+#, c-format
+msgid " using certificate ID 0x%08lX\n"
+msgstr " using certificate ID 0x%08lX\n"
+
+#: 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:631
+msgid "Good signature from"
+msgstr "Good signature from"
+
+#: sm/verify.c:632
+msgid " aka"
+msgstr " aka"
+
+#: sm/verify.c:650
+msgid "This is a qualified signature\n"
+msgstr "This is a qualified signature\n"
+
+#: dirmngr/certcache.c:124
+#, c-format
+msgid "can't initialize certificate cache lock: %s\n"
+msgstr "can't initialize certificate cache lock: %s\n"
+
+#: dirmngr/certcache.c:135
+#, 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:146
+#, 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:157
+#, 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:297
+#, c-format
+msgid "dropping %u certificates from the cache\n"
+msgstr "dropping %u certificates from the cache\n"
+
+#: dirmngr/certcache.c:415 dirmngr/certcache.c:502 dirmngr/certcache.c:612
+#, c-format
+msgid "can't parse certificate '%s': %s\n"
+msgstr "can't parse certificate '%s': %s\n"
+
+#: dirmngr/certcache.c:423 dirmngr/certcache.c:509 dirmngr/certcache.c:623
+#, c-format
+msgid "certificate '%s' already cached\n"
+msgstr "certificate ‘%s’ already cached\n"
+
+#: dirmngr/certcache.c:427 dirmngr/certcache.c:517 dirmngr/certcache.c:632
+#, c-format
+msgid "trusted certificate '%s' loaded\n"
+msgstr "trusted certificate ‘%s’ loaded\n"
+
+#: dirmngr/certcache.c:429
+#, c-format
+msgid "certificate '%s' loaded\n"
+msgstr "certificate ‘%s’ loaded\n"
+
+#: dirmngr/certcache.c:433 dirmngr/certcache.c:519 dirmngr/certcache.c:634
+#, c-format
+msgid " SHA1 fingerprint = %s\n"
+msgstr " SHA1 fingerprint = %s\n"
+
+#: dirmngr/certcache.c:436 dirmngr/certcache.c:522 dirmngr/certcache.c:637
+msgid " issuer ="
+msgstr " issuer ="
+
+#: dirmngr/certcache.c:437 dirmngr/certcache.c:523 dirmngr/certcache.c:638
+msgid " subject ="
+msgstr " subject ="
+
+#: dirmngr/certcache.c:441 dirmngr/certcache.c:511 dirmngr/certcache.c:626
+#, c-format
+msgid "error loading certificate '%s': %s\n"
+msgstr "error loading certificate '%s': %s\n"
+
+#: dirmngr/certcache.c:811
+#, c-format
+msgid "permanently loaded certificates: %u\n"
+msgstr "permanently loaded certificates: %u\n"
+
+#: dirmngr/certcache.c:813
+#, c-format
+msgid " runtime cached certificates: %u\n"
+msgstr " runtime cached certificates: %u\n"
+
+#: dirmngr/certcache.c:815
+#, c-format
+msgid " trusted certificates: %u (%u,%u,%u,%u)\n"
+msgstr " trusted certificates: %u (%u,%u,%u,%u)\n"
+
+#: dirmngr/certcache.c:843 dirmngr/dirmngr-client.c:385
+msgid "certificate already cached\n"
+msgstr "certificate already cached\n"
+
+#: dirmngr/certcache.c:845
+msgid "certificate cached\n"
+msgstr "certificate cached\n"
+
+#: dirmngr/certcache.c:847 dirmngr/certcache.c:867
+#: dirmngr/dirmngr-client.c:389
+#, c-format
+msgid "error caching certificate: %s\n"
+msgstr "error caching certificate: %s\n"
+
+#: dirmngr/certcache.c:930
+#, c-format
+msgid "invalid SHA1 fingerprint string '%s'\n"
+msgstr "invalid SHA1 fingerprint string ‘%s’\n"
+
+#: dirmngr/certcache.c:1376 dirmngr/certcache.c:1385
+#, c-format
+msgid "error fetching certificate by S/N: %s\n"
+msgstr "error fetching certificate by S/N: %s\n"
+
+#: dirmngr/certcache.c:1537 dirmngr/certcache.c:1546
+#, c-format
+msgid "error fetching certificate by subject: %s\n"
+msgstr "error fetching certificate by subject: %s\n"
+
+#: dirmngr/certcache.c:1652 dirmngr/validate.c:483
+msgid "no issuer found in certificate\n"
+msgstr "no issuer found in certificate\n"
+
+#: dirmngr/certcache.c:1662
+#, 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:1700
+#, c-format
+msgid "ksba_crl_parse failed: %s\n"
+msgstr "ksba_crl_parse failed: %s\n"
+
+#: dirmngr/crlcache.c:1715
+#, c-format
+msgid "error getting update times of CRL: %s\n"
+msgstr "error getting update times of CRL: %s\n"
+
+#: dirmngr/crlcache.c:1722
+#, 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:1726
+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:1746
+#, c-format
+msgid "error getting CRL item: %s\n"
+msgstr "error getting CRL item: %s\n"
+
+#: dirmngr/crlcache.c:1761
+#, 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:1788
+#, c-format
+msgid "no CRL issuer found in CRL: %s\n"
+msgstr "no CRL issuer found in CRL: %s\n"
+
+#: dirmngr/crlcache.c:1803
+msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
+msgstr "locating CRL issuer certificate by authorityKeyIdentifier\n"
+
+#: dirmngr/crlcache.c:1849
+#, c-format
+msgid "CRL signature verification failed: %s\n"
+msgstr "CRL signature verification failed: %s\n"
+
+#: dirmngr/crlcache.c:1861
+#, 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:166
++#: dirmngr/dirmngr.c:169
+msgid "list the contents of the CRL cache"
+msgstr "list the contents of the CRL cache"
+
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
+msgid "|FILE|load CRL from FILE into cache"
+msgstr "|FILE|load CRL from FILE into cache"
+
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
+msgid "|URL|fetch a CRL from URL"
+msgstr "|URL|fetch a CRL from URL"
+
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
+msgid "shutdown the dirmngr"
+msgstr "shutdown the dirmngr"
+
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
+msgid "flush the cache"
+msgstr "flush the cache"
+
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|write server mode logs to FILE"
+
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
+msgid "run without asking a user"
+msgstr "run without asking a user"
+
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
+msgid "force loading of outdated CRLs"
+msgstr "force loading of outdated CRLs"
+
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
+msgid "allow sending OCSP requests"
+msgstr "allow sending OCSP requests"
+
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
+msgid "allow online software version check"
+msgstr "allow online software version check"
+
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
+msgid "inhibit the use of HTTP"
+msgstr "inhibit the use of HTTP"
+
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
+msgid "inhibit the use of LDAP"
+msgstr "inhibit the use of LDAP"
+
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
+msgid "ignore HTTP CRL distribution points"
+msgstr "ignore HTTP CRL distribution points"
+
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
+msgid "ignore LDAP CRL distribution points"
+msgstr "ignore LDAP CRL distribution points"
+
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignore certificate contained OCSP service URLs"
+
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
+msgid "|URL|redirect all HTTP requests to URL"
+msgstr "|URL|redirect all HTTP requests to URL"
+
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
+msgid "|HOST|use HOST for LDAP queries"
+msgstr "|HOST|use HOST for LDAP queries"
+
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
+msgid "do not use fallback hosts with --ldap-proxy"
+msgstr "do not use fallback hosts with --ldap-proxy"
+
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
+msgid "|FILE|read LDAP server list from FILE"
+msgstr "|FILE|read LDAP server list from FILE"
+
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
+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:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
+msgid "|N|set LDAP timeout to N seconds"
+msgstr "|N|set LDAP timeout to N seconds"
+
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
+msgid "|URL|use OCSP responder at URL"
+msgstr "|URL|use OCSP responder at URL"
+
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
+msgid "|FPR|OCSP response signed by FPR"
+msgstr "|FPR|OCSP response signed by FPR"
+
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
+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:229
++#: dirmngr/dirmngr.c:232
+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:231
++#: dirmngr/dirmngr.c:234
+msgid "route all network traffic via Tor"
+msgstr "route all network traffic via Tor"
+
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
+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:392
++#: dirmngr/dirmngr.c:400
+msgid "Usage: @DIRMNGR@ [options] (-h for help)"
+msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
+
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
+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:474
++#: dirmngr/dirmngr.c:482
+#, c-format
+msgid "valid debug levels are: %s\n"
+msgstr "valid debug levels are: %s\n"
+
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
+#, c-format
+msgid "usage: %s [options] "
+msgstr "usage: %s [options] "
+
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
+msgid "colons are not allowed in the socket name\n"
+msgstr "colons are not allowed in the socket name\n"
+
- #: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
+#, c-format
+msgid "fetching CRL from '%s' failed: %s\n"
+msgstr "fetching CRL from ‘%s’ failed: %s\n"
+
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
+#, c-format
+msgid "processing CRL from '%s' failed: %s\n"
+msgstr "processing CRL from ‘%s’ failed: %s\n"
+
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
+#, c-format
+msgid "%s:%u: line too long - skipped\n"
+msgstr "%s:%u: line too long - skipped\n"
+
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
+#, c-format
+msgid "%s:%u: invalid fingerprint detected\n"
+msgstr "%s:%u: invalid fingerprint detected\n"
+
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
+#, c-format
+msgid "%s:%u: read error: %s\n"
+msgstr "%s:%u: read error: %s\n"
+
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
+#, 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:1838
++#: dirmngr/dirmngr.c:1851
+msgid "SIGHUP received - re-reading configuration and flushing caches\n"
+msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
+
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
+msgid "SIGUSR2 received - no action defined\n"
+msgstr "SIGUSR2 received - no action defined\n"
+
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
+msgid "SIGTERM received - shutting down ...\n"
+msgstr "SIGTERM received - shutting down ...\n"
+
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
+#, c-format
+msgid "SIGTERM received - still %d active connections\n"
+msgstr "SIGTERM received - still %d active connections\n"
+
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
+msgid "shutdown forced\n"
+msgstr "shutdown forced\n"
+
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
+msgid "SIGINT received - immediate shutdown\n"
+msgstr "SIGINT received - immediate shutdown\n"
+
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
+#, 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:618
+#, c-format
+msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgstr "start_cert_fetch: invalid pattern ‘%s’\n"
+
+#: 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: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:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
+#, c-format
+msgid "assuan_inquire(%s) failed: %s\n"
+msgstr "assuan_inquire(%s) failed: %s\n"
+
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
+msgid "ldapserver missing"
+msgstr "ldapserver missing"
+
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
+msgid "serialno missing in cert ID"
+msgstr "serialno missing in cert ID"
+
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
+#, c-format
+msgid "assuan_inquire failed: %s\n"
+msgstr "assuan_inquire failed: %s\n"
+
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
+#, c-format
+msgid "fetch_cert_by_url failed: %s\n"
+msgstr "fetch_cert_by_url failed: %s\n"
+
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
+#, c-format
+msgid "error sending data: %s\n"
+msgstr "error sending data: %s\n"
+
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
+#, c-format
+msgid "start_cert_fetch failed: %s\n"
+msgstr "start_cert_fetch failed: %s\n"
+
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
+#, c-format
+msgid "fetch_next_cert failed: %s\n"
+msgstr "fetch_next_cert failed: %s\n"
+
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
+#, c-format
+msgid "max_replies %d exceeded\n"
+msgstr "max_replies %d exceeded\n"
+
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
+#, c-format
+msgid "can't allocate control structure: %s\n"
+msgstr "can't allocate control structure: %s\n"
+
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
+#, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "failed to allocate assuan context: %s\n"
+
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
+#, c-format
+msgid "failed to initialize the server: %s\n"
+msgstr "failed to initialize the server: %s\n"
+
- #: dirmngr/server.c:2632
++#: dirmngr/server.c:2738
+#, 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:2663
++#: dirmngr/server.c:2771
+#, c-format
+msgid "Assuan accept problem: %s\n"
+msgstr "Assuan accept problem: %s\n"
+
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
+#, 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
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
+msgid "Options controlling the diagnostic output"
+msgstr "Options controlling the diagnostic output"
+
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
+msgid "Options controlling the configuration"
+msgstr "Options controlling the configuration"
+
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
+msgid "Options useful for debugging"
+msgstr "Options useful for debugging"
+
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
+msgid "Options controlling the security"
+msgstr "Options controlling the security"
+
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|expire SSH keys after N seconds"
+
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|set maximum PIN cache lifetime to N seconds"
+
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|set maximum SSH key lifetime to N seconds"
+
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
+msgid "Options enforcing a passphrase policy"
+msgstr "Options enforcing a passphrase policy"
+
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
+msgid "do not allow bypassing the passphrase policy"
+msgstr "do not allow bypassing the passphrase policy"
+
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr "|N|set minimal required length for new passphrases to N"
+
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr "|N|require at least N non-alpha characters for a new passphrase"
+
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE|check new passphrases against pattern in FILE"
+
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|expire the passphrase after N days"
+
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
+msgid "do not allow the reuse of old passphrases"
+msgstr "do not allow the reuse of old passphrases"
+
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|set the Pinentry timeout to N seconds"
+
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|use NAME as default secret key"
+
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|encrypt to user ID NAME as well"
+
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|set up email aliases"
+
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
+msgid "Configuration for Keyservers"
+msgstr "Configuration for Keyservers"
+
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|use keyserver at URL"
+
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
+msgid "allow PKA lookups (DNS requests)"
+msgstr "allow PKA lookups (DNS requests)"
+
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
+msgid "disable all access to the dirmngr"
+msgstr "disable all access to the dirmngr"
+
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
+
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
+msgid "do not check CRLs for root certificates"
+msgstr "do not check CRLs for root certificates"
+
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
+msgid "Options controlling the format of the output"
+msgstr "Options controlling the format of the output"
+
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
+msgid "Options controlling the interactivity and enforcement"
+msgstr "Options controlling the interactivity and enforcement"
+
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
+msgid "Options controlling the use of Tor"
+msgstr "Options controlling the use of Tor"
+
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
+msgid "Configuration for HTTP servers"
+msgstr "Configuration for HTTP servers"
+
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
+msgid "use system's HTTP proxy setting"
+msgstr "use system's HTTP proxy setting"
+
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
+msgid "Configuration of LDAP servers to use"
+msgstr "Configuration of LDAP servers to use"
+
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
+msgid "LDAP server list"
+msgstr "LDAP server list"
+
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
+msgid "Configuration for OCSP"
+msgstr "Configuration for OCSP"
+
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
+msgid "OpenPGP"
+msgstr "OpenPGP"
+
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
+msgid "Private Keys"
+msgstr "Private Keys"
+
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
+msgid "Smartcards"
+msgstr "Smartcards"
+
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
+msgid "S/MIME"
+msgstr "S/MIME"
+
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
+msgid "Network"
+msgstr "Network"
+
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
+msgid "Passphrase Entry"
+msgstr "Passphrase Entry"
+
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
+msgid "Component not suitable for launching"
+msgstr "Component not suitable for launching"
+
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
+#, c-format
+msgid "External verification of component %s failed"
+msgstr "External verification of component %s failed"
+
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
+msgid "Note that group specifications are ignored\n"
+msgstr "Note that group specifications are ignored\n"
+
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
+#, c-format
+msgid "error closing '%s'\n"
+msgstr "error closing ‘%s’\n"
+
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
+#, c-format
+msgid "error parsing '%s'\n"
+msgstr "error parsing ‘%s’\n"
+
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
+msgid "list all components"
+msgstr "list all components"
+
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
+msgid "check all programs"
+msgstr "check all programs"
+
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
+msgid "|COMPONENT|list options"
+msgstr "|COMPONENT|list options"
+
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
+msgid "|COMPONENT|change options"
+msgstr "|COMPONENT|change options"
+
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
+msgid "|COMPONENT|check options"
+msgstr "|COMPONENT|check options"
+
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
+msgid "apply global default values"
+msgstr "apply global default values"
+
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
+msgid "|FILE|update configuration files using FILE"
+msgstr "|FILE|update configuration files using FILE"
+
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
+msgid "get the configuration directories for @GPGCONF@"
+msgstr "get the configuration directories for @GPGCONF@"
+
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
+msgid "list global configuration file"
+msgstr "list global configuration file"
+
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
+msgid "check global configuration file"
+msgstr "check global configuration file"
+
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
+msgid "query the software version database"
+msgstr "query the software version database"
+
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
+msgid "reload all or a given component"
+msgstr "reload all or a given component"
+
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
+msgid "launch a given component"
+msgstr "launch a given component"
+
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
+msgid "kill a given component"
+msgstr "kill a given component"
+
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
+msgid "use as output file"
+msgstr "use as output file"
+
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
+msgid "activate changes at runtime, if possible"
+msgstr "activate changes at runtime, if possible"
+
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
+msgid "Usage: @GPGCONF@ [options] (-h for help)"
+msgstr "Usage: @GPGCONF@ [options] (-h for help)"
+
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
+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:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
+msgid "Need one component argument"
+msgstr "Need one component argument"
+
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
+msgid "Component not found"
+msgstr "Component not found"
+
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
+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 c5cc236,002e2dc..d6323e7
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2002-04-14 14:33+0100\n"
"Last-Translator: Edmund GRIMLEY EVANS <edmundo at rano.org>\n"
"Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
@@@ -158,26 -129,11 +158,26 @@@ msgstr "malbona pasfrazo
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "protekto-metodo %d%s ne estas realigita\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -383,8 -300,6 +383,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "ŝanĝi la pasfrazon"
- #: agent/gpg-agent.c:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -394,124 -309,92 +394,124 @@@ msgstr "
"Opcioj:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "Ŝlosilo estas anstataŭigita."
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "detala eligo"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "iom malpli da informoj"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "serĉi ŝlosilojn ĉe ŝlosilservilo"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "aktualigi la fido-datenaron"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, 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:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
#, fuzzy
msgid "allow presetting passphrase"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "ne realigita"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -520,165 -403,117 +520,160 @@@ msgstr "ne realigita
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 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:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, 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:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, fuzzy, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: agent/gpg-agent.c:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "ne povas krei %s: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, fuzzy, c-format
msgid "socket name '%s' is too long\n"
msgstr "Valida atestilrevoko"
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
#, 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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: agent/gpg-agent.c:2241 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:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "skribas sekretan ŝlosilon al '%s'\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
- #: agent/gpg-agent.c:2327
++#: agent/gpg-agent.c:2351
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: ne povas krei dosierujon: %s\n"
- #: agent/gpg-agent.c:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2771
++#: agent/gpg-agent.c:2795
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "aktualigo de sekreto malsukcesis: %s\n"
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu ŝlosiloj ignoritaj\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
@@@ -694,8 -527,6 +689,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -703,9 -534,6 +698,9 @@@ msgstr "
"@Komandoj:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -759,8 -579,6 +754,8 @@@ msgstr "nuligita de uzanto\n
msgid "error while asking for the passphrase: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
@@@ -944,8 -727,6 +939,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
@@@ -1426,7 -1109,6 +1421,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
#, fuzzy
msgid "out of core\n"
msgstr "ne traktita"
@@@ -1485,8 -1156,6 +1480,8 @@@ msgstr "publika ŝlosilo %08lX ne trovi
msgid "waiting for lock %s...\n"
msgstr "skribas sekretan ŝlosilon al '%s'\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1670,8 -1302,6 +1665,8 @@@ msgstr "sekreta ŝlosilo ne havebla
msgid "OpenPGP card no. %s detected\n"
msgstr ""
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "ne povas fari tion en neinteraga reĝimo\n"
@@@ -1686,10 -1314,6 +1681,10 @@@ msgstr "Tiu komando ne eblas en la reĝ
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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Via elekto? "
@@@ -1751,17 -1362,11 +1746,17 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "skribas publikan ŝlosilon al '%s'\n"
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, 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:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
@@@ -1818,7 -1412,6 +1813,7 @@@ msgstr "Kreado de ŝlosiloj malsukcesis
msgid "not an OpenPGP card"
msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
@@@ -1854,13 -1441,10 +1849,13 @@@ msgstr "Kiun ŝlosilgrandon vi deziras
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr ""
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rondigita ĝis %u bitoj\n"
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1915,9 -1489,6 +1910,9 @@@ msgstr " (%d) RSA (nur ĉifri)\n
msgid " (3) Authentication key\n"
msgstr ""
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Nevalida elekto.\n"
@@@ -2058,22 -1599,14 +2053,22 @@@ msgstr "--output ne funkcias por ĉi ti
msgid "can't open '%s'\n"
msgstr "ne povas malfermi '%s'\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "eraro dum legado de ŝlosilbloko: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "ŝlosilo '%s' ne trovita: %s\n"
@@@ -2167,8 -1682,6 +2162,8 @@@ msgid "
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, 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"
@@@ -2195,7 -1704,6 +2190,7 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s-ĉifrita por: %s\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, fuzzy, c-format
msgid "option '%s' may not be used in %s mode\n"
msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
@@@ -2313,27 -1797,21 +2308,27 @@@ msgstr "%s: ignorita: %s\n
msgid "writing to '%s'\n"
msgstr "skribas al '%s'\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, 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:1904
++#: g10/export.c:1909
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "skribas sekretan ŝlosilon al '%s'\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "AVERTO: nenio estis eksportita\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/plaintext.c:167 g10/plaintext.c:190
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
@@@ -2344,13 -1821,10 +2339,13 @@@ msgstr "eraro dum kreado de '%s': %s\n
msgid "[User ID not found]"
msgstr "[Uzantidentigilo ne trovita]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "nevalida kiraso"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2360,60 -1833,49 +2355,60 @@@
msgid "error looking up: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "eraro dum kreado de '%s': %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "eraro dum kreado de '%s': %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
#, fuzzy
msgid "No fingerprint"
msgstr "Fingrospuro:"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "ŝlosilo '%s' ne trovita: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, 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/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "nevalida kiraso"
@@@ -2623,7 -2039,6 +2618,7 @@@ msgstr "uzi tekstan reĝimon
msgid "|FILE|write output to FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "fari neniajn ŝanĝojn"
@@@ -3015,7 -2357,6 +3010,7 @@@ msgstr "AVERTO: '%s' estas malplena dos
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTO: programo povas krei core-dosieron!\n"
@@@ -3034,7 -2372,6 +3029,7 @@@ msgstr "%s ne eblas kun %s!\n
msgid "%s makes no sense with %s!\n"
msgstr "%s ne havas sencon kun %s!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr ""
@@@ -3043,7 -2379,6 +3038,7 @@@
msgid "will not run with insecure memory due to %s\n"
msgstr "skribas sekretan ŝlosilon al '%s'\n"
- #: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "elektita ĉifrad-metodo ne validas\n"
@@@ -3115,8 -2436,6 +3110,8 @@@ msgstr "nevalidaj preferoj\n
msgid "%s does not yet work with %s\n"
msgstr "%s ne havas sencon kun %s!\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
@@@ -3245,7 -2538,6 +3240,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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
@@@ -4630,7 -3648,6 +4625,7 @@@ msgstr "Ĉu vi estas certa, ke vi ankor
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila ŝlosilo.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr ""
@@@ -4937,55 -3893,43 +4932,55 @@@ msgstr "tro da '%c'-preferoj\n
msgid "too many compression preferences\n"
msgstr "tro da '%c'-preferoj\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "nevalida signo en signoĉeno\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
#, fuzzy
msgid "writing direct signature\n"
msgstr "skribas mem-subskribon\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "skribas mem-subskribon\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "skribas ŝlosilbindan subskribon\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "ŝlosilgrando nevalida; uzas %u bitojn\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "ŝlosilgrando rondigita ĝis %u bitoj\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
#, fuzzy
msgid "Sign"
msgstr "subskribi"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
#, fuzzy
msgid "Encrypt"
msgstr "ĉifri datenojn"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr ""
@@@ -4999,157 -3943,126 +4994,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (nur ĉifri)\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Bonvolu elekti, kian ŝlosilon vi deziras:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA kaj ElGamal (implicita elekto)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA kaj ElGamal (implicita elekto)\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (nur subskribi)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (nur subskribi)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (nur ĉifri)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (nur ĉifri)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (nur ĉifri)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (nur ĉifri)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA kaj ElGamal (implicita elekto)\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (nur subskribi)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (nur ĉifri)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (nur ĉifri)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (nur ĉifri)\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Subskribo-notacio: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "rondigita ĝis %u bitoj\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Petita ŝlosilgrando estas %u bitoj\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Bonvolu elekti, kian ŝlosilon vi deziras:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5165,7 -4078,6 +5160,7 @@@ msgstr "
" <n>m = ŝlosilo eksvalidiĝos post n monatoj\n"
" <n>y = ŝlosilo eksvalidiĝos post n jaroj\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5181,40 -4093,32 +5176,40 @@@ msgstr "
" <n>m = ŝlosilo eksvalidiĝos post n monatoj\n"
" <n>y = ŝlosilo eksvalidiĝos post n jaroj\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "Ŝlosilo validu ...? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Ŝlosilo validu por ...? (0) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "nevalida valoro\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s neniam eksvalidiĝos\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s neniam eksvalidiĝos\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s eksvalidiĝos je %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5222,12 -4126,10 +5217,12 @@@ msgstr "
"Via sistemo ne povas montri datojn post 2038.\n"
"Tamen, ĝi estos ĝuste traktata ĝis 2106.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Ĉu tio estas ĝusta (j/n)? "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5238,7 -4140,6 +5233,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
#, fuzzy
msgid ""
"\n"
@@@ -5254,50 -4155,39 +5249,50 @@@ msgstr "
" \"Heinrich Heine (la poeto) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Vera nomo: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Nevalida signo en nomo\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "Nomo ne povas komenciĝi per cifero\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "Nomo devas havi almenaŭ 5 signojn\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "Retadreso: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "Nevalida retadreso\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Komento: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Nevalida signo en komento\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Vi uzas la signaron '%s'.\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5308,7 -4198,6 +5303,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Bonvolu ne meti la retadreson en la veran nomon aŭ la komenton\n"
@@@ -5323,35 -4212,28 +5318,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnKkAaBbFf"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ŝanĝu (N)omon, (K)omenton, (A)adreson, aŭ (F)ini? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Ŝanĝu (N)omon, (K)omenton, (A)adreson, aŭ (B)one/(F)ini? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Ŝanĝu (N)omon, (K)omenton, (A)adreson, aŭ (F)ini? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Ŝanĝu (N)omon, (K)omenton, (A)adreson, aŭ (B)one/(F)ini? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Bonvolu korekti la eraron unue\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5363,13 -4245,10 +5358,13 @@@ msgstr "
"kreado de la primoj; tio donas al la stokastilo pli bonan ŝancon\n"
"akiri sufiĉe da entropio.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5377,66 -4256,53 +5372,66 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "'%s' jam densigita\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
#, fuzzy
msgid "creating anyway\n"
msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Kreado de ŝlosiloj nuligita.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "ne povas krei '%s': %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "NOTO: sekreta ŝlosilo %08lX eksvalidiĝis je %s\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "skribas publikan ŝlosilon al '%s'\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "neniu skribebla publika ŝlosilaro trovita: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "eraro dum skribado de publika ŝlosilaro '%s': %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "publika kaj sekreta ŝlosiloj kreitaj kaj subskribitaj.\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5445,7 -4311,6 +5440,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:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5453,7 -4318,6 +5448,7 @@@ msgstr "
"ŝlosilo estis kreita %lu sekundon en la estonteco (tempotordo aŭ "
"horloĝeraro)\n"
- #: g10/keygen.c:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5461,22 -4325,18 +5456,22 @@@ msgstr "
"ŝlosilo estis kreita %lu sekundojn en la estonteco (tempotordo aŭ "
"horloĝeraro)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
#, 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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
msgid "Secret parts of primary key are not available.\n"
msgstr "Sekretaj partoj de ĉefa ŝlosilo ne estas disponataj.\n"
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
#, 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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Ĉu vere krei? "
@@@ -6223,23 -4937,18 +6218,23 @@@ msgstr "Ĉu tio estas ĝusta (j/n)?
msgid "unable to display photo ID!\n"
msgstr "ne povas malfermi %s: %s\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Nenia kialo specifita"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "Ŝlosilo estas anstataŭigita."
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "Ŝlosilo estas kompromitita"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "Ŝlosilo estas ne plu uzata"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "Uzantidentigilo ne plu validas"
@@@ -6322,7 -5018,6 +6317,7 @@@ msgid "
"\n"
msgstr ""
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Via decido? "
@@@ -6473,46 -5140,37 +6468,46 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Ne estas certe, ke la subskribo apartenas al la posedanto.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ignorita: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: ignorita: publika ŝlosilo estas malŝaltita\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ignorita: publika ŝlosilo jam ĉeestas\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "ne povas konektiĝi al '%s': %s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Vi ne specifis uzantidentigilon. (Vi povas uzi \"-r\")\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6520,37 -5178,29 +6515,37 @@@ msgstr "
"\n"
"Donu la uzantidentigilon. Finu per malplena linio: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Uzantidentigilo ne ekzistas.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "ignorita: publika ŝlosilo jam difinita kiel implicita ricevonto\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "Publika ŝlosilo estas malŝaltita.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "ignorita: publika ŝlosilo jam agordita\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "nekonata implicita ricevonto '%s'\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "mankas validaj adresitoj\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "ŝlosilo %08lX: mankas uzantidentigilo\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "ŝlosilo %08lX: mankas uzantidentigilo\n"
@@@ -6654,7 -5282,6 +6649,7 @@@ msgstr "Sekreta ŝlosilo estas havebla.
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr ""
@@@ -6673,19 -5297,16 +6668,19 @@@ msgstr "ŝlosilo %08lX: revokatestilo a
msgid "no revocation keys found for \"%s\"\n"
msgstr ""
- #: g10/revoke.c:552
++#: g10/revoke.c:565
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6694,19 -5315,16 +6689,19 @@@
"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:577
++#: g10/revoke.c:590
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "ŝlosilo '%s' ne trovita: %s\n"
@@@ -6714,23 -5332,19 +6709,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6741,37 -5355,30 +6736,37 @@@
"your machine might store the data and make it available to others!\n"
msgstr ""
- #: g10/revoke.c:775
++#: g10/revoke.c:788
#, fuzzy
msgid "Please select the reason for the revocation:\n"
msgstr "Kialo por revoko: "
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr ""
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr ""
- #: g10/revoke.c:828
++#: g10/revoke.c:841
#, fuzzy
msgid "Enter an optional description; end it with an empty line:\n"
msgstr ""
"\n"
"Donu la uzantidentigilon. Finu per malplena linio: "
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, fuzzy, c-format
msgid "Reason for revocation: %s\n"
msgstr "Kialo por revoko: "
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr ""
- #: g10/revoke.c:863
++#: g10/revoke.c:876
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
@@@ -7172,10 -5705,6 +7167,10 @@@ msgstr "eraro dum kreado de pasfrazo: %
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
@@@ -7207,7 -5731,6 +7202,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
@@@ -7517,18 -5991,14 +7512,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7592,7 -6050,6 +7587,7 @@@ msgstr "
msgid "no need for a trustdb check\n"
msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "sekva kontrolo de fido-datenaro je %s\n"
@@@ -7620,37 -6072,31 +7615,37 @@@ msgstr "
msgid "checking the trustdb\n"
msgstr "kontrolas la fido-datenaron\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "%lu ŝlosiloj jam traktitaj\n"
msgstr[1] "%lu ŝlosiloj jam traktitaj\n"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, c-format
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
#, fuzzy
msgid "no ultimately trusted keys found\n"
msgstr "publika ŝlosilo de absolute fidata ŝlosilo %08lX ne trovita\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "publika ŝlosilo de absolute fidata ŝlosilo %08lX ne trovita\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@@ -8080,76 -6440,60 +8075,76 @@@ msgstr "ŝanĝi la pasfrazon
msgid "|N|Initial New PIN"
msgstr "Donu la uzantidentigilon: "
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr ""
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
#, fuzzy
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
#, fuzzy
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
#, fuzzy
msgid "do not use the internal CCID driver"
msgstr "tute ne uzi la terminalon"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr ""
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr ""
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
#, fuzzy
msgid "deny the use of admin card commands"
msgstr "malkongruaj komandoj\n"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8880,7 -7071,6 +8875,7 @@@ msgstr "aldoni ĉi tiun ŝlosilaron al
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SERVILO|uzi ĉi tiun ŝlosilservilon por serĉi ŝlosilojn"
@@@ -8940,17 -7120,14 +8935,17 @@@ msgstr " s = supersalti ĉi tiun ŝlosi
msgid "could not parse keyserver\n"
msgstr "ne povis analizi URI de ŝlosilservilo\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "skribas al '%s'\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "ne povas fermi '%s': %s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9897,116 -7884,88 +9892,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
#, fuzzy
msgid "run without asking a user"
msgstr "Ĉu fini sen skribi ŝanĝojn? "
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "ne povis analizi URI de ŝlosilservilo\n"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10019,91 -7978,72 +10014,91 @@@ msgstr "
"@\n"
"(Vidu la manpaĝon por kompleta listo de ĉiuj komandoj kaj opcioj)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uzado: gpg [opcioj] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
#, 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:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "pasfrazo estas tro longa\n"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s: nevalida dosiero-versio %d\n"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "kiraso: %s\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
#, fuzzy
msgid "shutdown forced\n"
msgstr "ne traktita"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10545,77 -8394,61 +10540,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "ne povas krei '%s': %s\n"
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: malsukcesis krei haktabelon: %s\n"
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
#, 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:2632
++#: dirmngr/server.c:2738
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "malsukcesis rekonstrui ŝlosilaran staplon: %s\n"
- #: dirmngr/server.c:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10659,7 -8484,6 +10654,7 @@@ msgstr "Valida atestilrevoko
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
#, fuzzy
msgid "quiet"
msgstr "fini"
@@@ -10752,286 -8556,218 +10747,286 @@@ 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr ""
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr ""
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|uzi pasfraz-reĝimon N"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOMO|ĉifri por NOMO"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "ne povis analizi URI de ŝlosilservilo\n"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NOMO|uzi ĉifrad-metodon NOMO por pasfrazoj"
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "reteraro"
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
msgid "Passphrase Entry"
msgstr "malbona pasfrazo"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
#, fuzzy
msgid "Component not suitable for launching"
msgstr "publika ŝlosilo ne trovita"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
#, fuzzy
msgid "list global configuration file"
msgstr "%s: nova opcio-dosiero kreita\n"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
#, fuzzy
msgid "check global configuration file"
msgstr "%s: nova opcio-dosiero kreita\n"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "aktualigi la fido-datenaron"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "uzi dosieron por eligo"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
#, fuzzy
msgid "Component not found"
msgstr "publika ŝlosilo ne trovita"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
#, fuzzy
msgid "No argument allowed"
msgstr "skribas sekretan ŝlosilon al '%s'\n"
diff --cc po/es.po
index 0450fa0,a631ced..fb2e11e
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2017-11-02 17:39+0100\n"
"Last-Translator: Jaime Suárez <jaime.suma at gmail.com>\n"
"Language-Team: Spanish <es at li.org>\n"
@@@ -180,26 -151,11 +180,26 @@@ msgstr "Frase contraseña errónea
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "no pueden usarse claves ssh de más de %d bits\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -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:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -441,123 -356,91 +441,123 @@@ msgstr "
"@Opciones:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr "ejecutar en modo demonio (segundo plano)"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr "ejecutar en modo servidor (primer plano)"
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "run in server mode"
msgid "run in supervised mode"
msgstr "ejecutar en modo servidor"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "prolijo"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "algo más discreto"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr "salida de datos estilo sh"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr "salida de datos estilo csh"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|FICHERO|lee opciones desde FICHERO"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr "no independizarse de la consola"
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "usar un fichero log para el servidor"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|usar PGM como el programa para entrada de PIN"
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|usar PCM como programa SCdaemon"
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
msgid "do not use the SCdaemon"
msgstr "no usar SCdaemon"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, 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:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr "ignorar peticiones de cambiar el TTY"
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr "ignorar peticiones de cambiar el display X"
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|los PINs en la caché expiran en N segundos"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr "no usar el caché de PINs al firmar"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, 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:231
++#: agent/gpg-agent.c:233
#, 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:234
++#: agent/gpg-agent.c:236
msgid "allow presetting passphrase"
msgstr "permitir preestablecer frase contraseña"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
#, fuzzy
#| msgid "enable ssh-agent emulation"
msgid "enable ssh support"
msgstr "permitir emulación de ssh-agent"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -566,21 -449,14 +566,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:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
#, 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:515
++#: agent/gpg-agent.c:525
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -592,155 -468,114 +592,150 @@@ msgstr "
"Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
"Manejo de claves privadas por GnuPG\n"
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, 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:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "el algoritmo de resumen seleccionado no inválido\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 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:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, 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:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, c-format
msgid "can't create socket: %s\n"
msgstr "no se puede crear el socket: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, 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:2209
++#: agent/gpg-agent.c:2232
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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
msgid "error getting nonce for the socket\n"
msgstr "error obteniendo valor único para el socket\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, 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:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, 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:2241 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
- #, c-format
- msgid "listen() failed: %s\n"
- msgstr "listen() falló: %s\n"
-
- #: agent/gpg-agent.c:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, 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:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, 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:2327
++#: agent/gpg-agent.c:2351
#, 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:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, 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:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "manejador 0x%lx para descriptor %d iniciado\n"
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "manejador 0x%lx pada descriptor %d finalizado\n"
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, 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:2771
++#: agent/gpg-agent.c:2795
#, 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:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, 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:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s detenido\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
@@@ -760,8 -593,6 +755,8 @@@ msgstr "
# Sí, este no he podido ser yo :-) Por cierto, ¿por qué la O no se
# puede acentuar? ¿demasiado alta?
# ¿Quién dice que no se puede? :-)
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -769,9 -600,6 +764,9 @@@ msgstr "
"@Órdenes:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -825,8 -645,6 +820,8 @@@ msgstr "cancelado\n
msgid "error while asking for the passphrase: %s\n"
msgstr "error pidiendo la frase contraseña: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -1026,8 -809,6 +1021,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, c-format
msgid "error forking process: %s\n"
msgstr "error bifurcando procesos: %s\n"
@@@ -1483,7 -1166,6 +1478,7 @@@ msgstr "la opción \"%.50s\" es ambigua
msgid "command \"%.50s\" is ambiguous\n"
msgstr "la orden \"%.50s\" es ambigua\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
msgid "out of core\n"
msgstr "memoria desbordada\n"
@@@ -1546,8 -1217,6 +1541,8 @@@ msgstr "bloqueo `%s' no hecho: %s\n
msgid "waiting for lock %s...\n"
msgstr "esperando al bloqueo %s...\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
@@@ -1730,8 -1362,6 +1725,8 @@@ msgstr "tarjeta OpenPGP no disponible:
msgid "OpenPGP card no. %s detected\n"
msgstr "tarjeta OpenPGP num. %s detectada\n"
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
msgid "can't do this in batch mode\n"
msgstr "imposible hacer esto en modo de proceso por lotes\n"
@@@ -1743,10 -1371,6 +1738,10 @@@ msgstr "Esta orden solo está disponibl
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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Su elección: "
@@@ -1803,17 -1414,11 +1798,17 @@@ msgstr "Error: nombre combinado demasia
msgid "URL to retrieve public key: "
msgstr "URL de donde recuperar la clave pública: "
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, 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:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
@@@ -1864,7 -1458,6 +1859,7 @@@ msgstr "la operación con la clave no e
msgid "not an OpenPGP card"
msgstr "no es una tarjeta OpenPGP"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, c-format
msgid "error getting current key info: %s\n"
msgstr "error obteniendo la información actual de la clave: %s\n"
@@@ -1904,13 -1491,10 +1899,13 @@@ msgstr "¿De qué tamaño quiere la cla
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr "Ahora la tarjeta se reconfigurará para generar una clave de %u bits\n"
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "redondeados a %u bits\n"
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 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"
@@@ -1971,9 -1545,6 +1966,9 @@@ msgstr " (2) Clave de cifrado\n
msgid " (3) Authentication key\n"
msgstr " (3) Clave de autentificación\n"
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Elección inválida.\n"
@@@ -2107,22 -1648,14 +2102,22 @@@ msgstr "--output no funciona con esta o
msgid "can't open '%s'\n"
msgstr "no se puede abrir `%s'\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "error leyendo bloque de claves: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
#| msgid "key \"%s\" not found: %s\n"
msgid "key \"%s\" not found\n"
@@@ -2218,8 -1733,6 +2213,8 @@@ msgstr "
"AVISO: forzar el cifrado simétrico %s (%d) viola las preferencias\n"
"del destinatario\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, 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"
@@@ -2252,7 -1761,6 +2247,7 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%s\"\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2374,26 -1858,20 +2369,26 @@@ msgstr "%s: omitido: %s\n
msgid "writing to '%s'\n"
msgstr "escribiendo en `%s'\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, 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:1904
++#: g10/export.c:1909
msgid "exporting secret keys not allowed\n"
msgstr "no se permite exportar claves secretas\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "ATENCIÓN: no se ha exportado nada\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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,14 -1880,11 +2398,14 @@@ msgstr "error creando `%s': %s\n
msgid "[User ID not found]"
msgstr "[ID de usuario no encontrado]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
msgstr "falta parámetro para la opción \"%.50s\"\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2421,61 -1894,50 +2416,61 @@@
msgid "error looking up: %s\n"
msgstr "error cerrando %s: %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "error escribiendo anillo `%s': %s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, fuzzy, c-format
#| msgid "automatically retrieved `%s' via %s\n"
msgid "automatically retrieved '%s' via %s\n"
msgstr "recuperado automáticamente `%s' vía %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, fuzzy, c-format
#| msgid "error retrieving `%s' via %s: %s\n"
msgid "error retrieving '%s' via %s: %s\n"
msgstr "error recuperando `%s' vía %s: %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
msgid "No fingerprint"
msgstr "No hay huella dactilar"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "clave secreta \"%s\" no encontrada: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "usando subclave %s en vez de clave primaria %s\n"
- #: g10/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "valid values for option '%s':\n"
@@@ -2677,7 -2093,6 +2672,7 @@@ msgstr "usa modo de texto canónico
msgid "|FILE|write output to FILE"
msgstr "|FICHERO|volcar salida en FICHERO"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "no hace ningún cambio"
@@@ -3090,7 -2432,6 +3085,7 @@@ msgstr "%s:%d: lista de auto-localizaci
msgid "invalid auto-key-locate list\n"
msgstr "lista de auto-localización de claves inválida\n"
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "ATENCIÓN: ¡el programa podría volcar un fichero core!\n"
@@@ -3109,7 -2447,6 +3104,7 @@@ msgstr "¡%s no permitido con %s!\n
msgid "%s makes no sense with %s!\n"
msgstr "¡%s no tiene sentido con %s!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr "AVISO: ejecutándose con hora del sistema falsificada"
@@@ -3118,7 -2454,6 +3113,7 @@@
msgid "will not run with insecure memory due to %s\n"
msgstr "no se ejecutará en memoria insegura por %s\n"
- #: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "el algoritmo de cifrado seleccionado es inválido\n"
@@@ -3181,8 -2502,6 +3176,8 @@@ msgstr "preferencias personales de comp
msgid "%s does not yet work with %s\n"
msgstr "%s aún no funciona con %s\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 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"
@@@ -3319,7 -2612,6 +3314,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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|DF|escribe información de estado en este descriptor de fichero"
@@@ -4670,7 -3688,6 +4665,7 @@@ msgstr "¿Está seguro de querer añadi
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "No puede añadir un ID fotográfico a una clave tipo PGP2.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr "¡Ese ID de usuario ya existe en esta clave!\n"
@@@ -4969,55 -3925,43 +4964,55 @@@ msgstr "demasiadas preferencias de resu
msgid "too many compression preferences\n"
msgstr "demasiadas preferencias de compresión\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, fuzzy, c-format
#| msgid "invalid item `%s' in preference string\n"
msgid "invalid item '%s' in preference string\n"
msgstr "caracter inválido `%s' en cadena de preferencias\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "escribiendo firma directa\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "escribiendo autofirma\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "escribiendo la firma de comprobación de clave\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tamaño de clave incorrecto; se usarán %u bits\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tamaño de clave redondeado a %u bits\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"AVISO: ciertos programas OpenPGP no usan claves DSAcon resúmenes de este "
"tamaño\n"
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
msgid "Sign"
msgstr "Firma"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr "Certificar"
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
msgid "Encrypt"
msgstr "Cifrado"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr "Autentificación"
@@@ -5031,158 -3975,127 +5026,158 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr "FfCcAaSs"
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Posibles accriones para una %s clave: "
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr "Acciones permitidas actualmente: "
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Conmutar la capacidad de firmar\n"
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Conmutar la capacidad de cifrado\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Conmutar la capacidad de autenticación\n"
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Acabado\n"
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Por favor seleccione tipo de clave deseado:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA y RSA (por defecto)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA y ElGamal\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (sólo firmar)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (sólo firmar)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (sólo cifrar)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (sólo cifrar)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (permite elegir capacidades)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (permite elegir capacidades)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, fuzzy, c-format
#| msgid " (%d) DSA and Elgamal\n"
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA y ElGamal\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (sólo firmar)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, fuzzy, c-format
#| msgid " (%d) DSA (set your own capabilities)\n"
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) DSA (permite elegir capacidades)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (sólo cifrar)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, fuzzy, c-format
#| msgid " (%d) Existing key\n"
msgid " (%d) Existing key\n"
msgstr " (%d) Clave existente\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
msgid "Enter the keygrip: "
msgstr "Introduzca keygrip: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "No es un keygrip válido (se esperaban 40 dígitos hex)\n"
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
msgid "No key with this keygrip\n"
msgstr "No hay claves con ese keygrip\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "redondeados a %u bits\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "las claves %s pueden tener entre %u y %u bits de longitud.\n"
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "¿De qué tamaño quiere la subclave? (%u) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "¿De qué tamaño quiere la clave? (%u) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "El tamaño requerido es de %u bits\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Por favor seleccione tipo de clave deseado:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5198,7 -4111,6 +5193,7 @@@ msgstr "
" <n>m = la clave caduca en n meses\n"
" <n>y = la clave caduca en n años\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5214,38 -4126,30 +5209,38 @@@ msgstr "
" <n>m = la clave caduca en n meses\n"
" <n>y = la clave caduca en n años\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "¿Validez de la clave (0)? "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Clave válida ¿durante? (%s) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "valor inválido\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
msgid "Key does not expire at all\n"
msgstr "La clave nunca caduca\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
msgid "Signature does not expire at all\n"
msgstr "La firma nunca caduca\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, c-format
msgid "Key expires at %s\n"
msgstr "La clave caduca %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, c-format
msgid "Signature expires at %s\n"
msgstr "La firma caduca el %s\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5253,11 -4157,9 +5248,11 @@@ msgstr "
"Su sistema no puede mostrar fechas más allá del 2038.\n"
"Sin embargo funcionará correctamente hasta el 2106.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
msgid "Is this correct? (y/N) "
msgstr "¿Es correcto? (s/n) "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5271,7 -4173,6 +5266,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5287,50 -4188,39 +5282,50 @@@ msgstr "
" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Nombre y apellidos: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Caracter inválido en el nombre\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "El nombre no puede empezar con un número\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "El nombre debe tener al menos 5 caracteres\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "Dirección de correo electrónico: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "Dirección inválida\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Comentario: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Caracter inválido en el comentario\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Está usando el juego de caracteres `%s'.\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5341,7 -4231,6 +5336,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Por favor no ponga la dirección de correo-e en el nombre real o en el "
@@@ -5358,31 -4247,24 +5353,31 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnCcDdVvSs"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "¿Cambia (N)ombre, (C)omentario, (D)irección o (S)alir? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "¿Cambia (N)ombre, (C)omentario, (D)irección o (V)ale/(S)alir? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "¿Cambia (N)ombre, (D)irección o (S)alir? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "¿Cambia (N)ombre, (D)irección o (V)ale/(S)alir? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Por favor corrija primero el error.\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5395,13 -4277,10 +5390,13 @@@ msgstr "
"generador de números aleatorios mayor oportunidad de recoger suficiente\n"
"entropía.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Creación de la clave fallida: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5409,71 -4288,58 +5404,71 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "la clave ya existe\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "¿Crear de todas formas?"
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "¿Crear de todas formas?"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Creación de claves cancelada.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, fuzzy, c-format
#| msgid "can't create backup file `%s': %s\n"
msgid "can't create backup file '%s': %s\n"
msgstr "no se puede crear fichero de respaldo `%s': %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "escribiendo clave pública en `%s'\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "anillo público de claves no escribible encontrado: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "error escribiendo anillo público `%s': %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "claves pública y secreta creadas y firmadas.\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
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"
@@@ -5481,7 -4347,6 +5476,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:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5489,7 -4354,6 +5484,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:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5497,21 -4361,17 +5492,21 @@@ msgstr "
"clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
#, 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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
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:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
msgid "Really create? (y/N) "
msgstr "¿Crear de verdad? (s/N) "
@@@ -6266,23 -4980,18 +6261,23 @@@ msgstr "¿Es correcta la foto? (s/n)
msgid "unable to display photo ID!\n"
msgstr "¡no puedo mostrar ID fotográfico!\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "No se dio ninguna razón"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "La clave ha sido reemplazada."
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "La clave ha sido comprometida"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "La clave ya no está en uso"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "El identificador de usuario ya no es válido"
@@@ -6360,7 -5056,6 +6355,7 @@@ msgstr "
"El mínimo nivel de confianza para esta clave es: %s\n"
"\n"
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "¿Su decisión? "
@@@ -6512,48 -5179,39 +6507,48 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " No es seguro que la firma pertenezca al propietario.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: omitido: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: omitida: clave pública deshabilitada\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: omitida: clave pública ya presente\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "no se puede conectar con `%s': %s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but no valid default keys given\n"
msgstr "línea %d: algoritmo inválido\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but option '%s' not given\n"
msgstr "línea %d: algoritmo inválido\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "No ha especificado un ID de usuario (puede usar \"-r\")\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr "Destinatarios actuales:\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6561,37 -5219,29 +6556,37 @@@ msgstr "
"\n"
"Introduzca ID de usuario. Acabe con una línea vacía: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "ID de usuario inexistente.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "omitida: clave pública ya designada como destinataria por defecto\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "Clave pública deshabilitada.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "omitida: clave pública ya establecida\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "desconocido el destinatario predefinido \"%s\"\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "no hay direcciones válidas\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Nota: la clave %s no usa %s\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Nota: clave %s no tiene preferencias para %s\n"
@@@ -6697,7 -5325,6 +6692,7 @@@ msgstr "Clave secreta disponible.\n
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "¿Crear un certificado de revocación para esta clave? (s/N)"
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "se fuerza salida con armadura ASCII.\n"
@@@ -6715,20 -5339,17 +6710,20 @@@ msgstr "Certificado de revocación crea
msgid "no revocation keys found for \"%s\"\n"
msgstr "no se encuetran claves de revocación para \"%s\"\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "¿Crear un certificado de revocación para esta clave? (s/N) "
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6737,20 -5358,17 +6732,20 @@@
"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:577
++#: g10/revoke.c:590
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Certificado de revocación creado.\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6759,22 -5377,18 +6754,22 @@@ msgstr "clave secreta \"%s\" no encontr
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "error escribiendo anillo `%s': %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "¿Crear un certificado de revocación para esta clave? (s/N) "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6793,33 -5407,26 +6788,33 @@@ msgstr "
"de impresión de su máquina podría almacenar los datos y hacerlos accesibles\n"
"a otras personas!\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Por favor elija una razón para la revocación:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Cancelar"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Probablemente quería seleccionar %d aquí)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Introduzca una descripción opcional; acábela con una línea vacía:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Razón para la revocación: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(No se dió descripción)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
msgid "Is this okay? (y/N) "
msgstr "¿Es correcto? (s/N) "
@@@ -7237,10 -5770,6 +7232,10 @@@ msgstr "error creando fichero temporal
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
@@@ -7275,7 -5799,6 +7270,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "error abriendo `%s': %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
@@@ -7595,19 -6069,15 +7590,19 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, 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:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7672,7 -6130,6 +7667,7 @@@ msgstr "usando %s como modelo de confia
msgid "no need for a trustdb check\n"
msgstr "no es necesaria una comprobación de la base de datos de confianza\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "siguiente comprobación de base de datos de confianza el: %s\n"
@@@ -7706,7 -6158,6 +7701,7 @@@ msgstr "por favor haga un --check-trust
msgid "checking the trustdb\n"
msgstr "comprobando base de datos de confianza\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
#| msgid "%lu keys processed so far\n"
msgid "%d key processed"
@@@ -7714,7 -6165,6 +7709,7 @@@ msgid_plural "%d keys processed
msgstr[0] "%lu claves procesadas hasta ahora\n"
msgstr[1] "%lu claves procesadas hasta ahora\n"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7722,16 -6172,13 +7717,16 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d claves procesadas (%d validaciones superadas)\n"
msgstr[1] "%d claves procesadas (%d validaciones superadas)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "no se encuentran claves absolutamente fiables\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "clave pública de la clave absolutamente fiable %s no encontrada\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7739,7 -6186,6 +7734,7 @@@ msgstr "
"nivel: %d validez: %3d firmada: %3d confianza: %d-, %dq, %dn, %dm, %df, "
"%du\n"
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -8178,59 -6538,46 +8173,59 @@@ msgstr "||Por favor inntroduzca su PIN
msgid "|N|Initial New PIN"
msgstr "|N|Nuevo PIN Inicial"
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr "ejecutar en modo multi servidor (primer plano)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
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:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
msgid "|FILE|write a log to FILE"
msgstr "|FICHERO|escribir log en FICHERO"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr "|N|conectar el lector al puerto N"
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NOMBRE|usa NOMBRE como driver ct-API"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NOMBRE|usa NOMBRE como driver PC/SC"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
msgid "do not use the internal CCID driver"
msgstr "no usa el driverd del CCID interno"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr "|N|desconectar la tarjeta después de N segundos de inactividad"
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
#, fuzzy
#| msgid "do not use a reader's keypad"
msgid "do not use a reader's pinpad"
msgstr "no usa el teclado del lector"
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
msgid "deny the use of admin card commands"
msgstr "denegar órdenes de administración de la tarjeta"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Uso: gpgconf [opciones] (-h para ayuda)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
#, fuzzy
#| msgid ""
#| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8242,19 -6589,16 +8237,19 @@@ msgstr "
"Sintaxis: scdaemon [opciones] [orden [args]]\n"
"Demonio de la tarjeta inteligente para GnuPG\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
#, fuzzy
#| msgid ""
#| "please use the option `--daemon' to run the program in the background\n"
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr "use la opción `--daemon' para ejectuar el programa en segundo plano\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr "manejador del descriptor %d iniciado\n"
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "manejador del descriptor %d terminado\n"
@@@ -8978,7 -7169,6 +8973,7 @@@ msgstr "|FICHERO|añade este anillo a l
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|ID-USUARIO|usa ID-USUARIO como clave secreta por defecto"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|ESPEC|usa este servidor para buscar claves"
@@@ -9042,19 -7222,16 +9037,19 @@@ msgstr "%s:%u: omitir esta línea\n
msgid "could not parse keyserver\n"
msgstr "no se puede interpretar el servidor de claves\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, fuzzy, c-format
#| msgid "importing common certificates `%s'\n"
msgid "importing common certificates '%s'\n"
msgstr "importando certificados comunes `%s'\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, 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:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr "orden inválida (no hay orden implícita)\n"
@@@ -10095,122 -8082,95 +10090,122 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
#, 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:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "pasar una orden a dirmngr"
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr "|FICHERO|escribir logs en modo servidor en FICHERO"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "¿Salir sin grabar? (s/N) "
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "permitir búsquedas PKA (peticiones DNS)"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
#, fuzzy
#| msgid "|FILE|read options from FILE"
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FICHERO|lee opciones desde FICHERO"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 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:216
++#: dirmngr/dirmngr.c:219
#, 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:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr ""
@@@ -10218,7 -8178,6 +10213,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:258
++#: dirmngr/dirmngr.c:262
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10231,13 -8190,11 +10226,13 @@@ msgstr "
"@\n"
"(Véase en la página del manual la lista completo de órdenes y opciones)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
#, 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:394
++#: dirmngr/dirmngr.c:402
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10249,88 -8206,71 +10244,88 @@@ msgstr "
"Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
"Manejo de claves privadas por GnuPG\n"
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, 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:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "uso: gpgsm [opciones] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
#, 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:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, 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:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, 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:1626
++#: dirmngr/dirmngr.c:1639
#, 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:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "huella dactilar no válida"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, 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:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "no forzado"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10818,87 -8667,71 +10813,87 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, 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:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, 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:1333
++#: dirmngr/server.c:1427
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_cert_by_url failed: %s\n"
msgstr "select fallido: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, 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:1483
++#: dirmngr/server.c:1577
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "start_cert_fetch failed: %s\n"
msgstr "select fallido: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_next_cert failed: %s\n"
msgstr "select fallido: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, 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:2603
++#: dirmngr/server.c:2709
#, 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:2624
++#: dirmngr/server.c:2730
#, 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:2632
++#: dirmngr/server.c:2738
#, 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:2663
++#: dirmngr/server.c:2771
#, 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:2682
++#: dirmngr/server.c:2790
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10950,7 -8775,6 +10945,7 @@@ msgstr "certificado correcto\n
msgid "certificate should not have been used for CRL signing\n"
msgstr "el certificado no debería haberse usado para firmar\n"
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
msgid "quiet"
msgstr "silencioso"
@@@ -11052,162 -8856,121 +11047,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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr "Opciones que controlan la salida de diagnósticos"
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr "Opciones que controlan la configuración"
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr "Opciones útiles para el depurado"
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr "Opciones que controlan la seguridad"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|las claves SSH caducan en N segundos"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|establecer vida máxima del caché de PIN en N segundos"
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|establecer vida máxima de la clave SSH en N segundos"
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr "Opciones que fuerzan una política de frases contraseña"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr "no permitir evitar la política de frases contraseña"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|establecer longitud mínima para nuevas frases contraseña en N"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|pedir al menos N caracteres no alfabéticos para nuevas contraseñas"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
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:587
++#: tools/gpgconf-comp.c:588
msgid "|N|expire the passphrase after N days"
msgstr "|N|frase contraseña caduca tras N días"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
msgid "do not allow the reuse of old passphrases"
msgstr "no permite reusar antiguas frases contraseña"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
#, fuzzy
#| msgid "|N|set maximum PIN cache lifetime to N seconds"
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|establecer vida máxima del caché de PIN en N segundos"
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOMBRE|cifra para el ususario NOMBRE también"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr "|ESPEC|establecer alias de email"
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr "Configuración para servidores de claves"
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
msgid "|URL|use keyserver at URL"
msgstr "|URL|usar servidor de claves en URL"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr "permitir búsquedas PKA (peticiones DNS)"
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr "|MECANISMOS|usa MECANISMOS para encontrar claves por emails"
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr "prohibir todo acceso al dirmngr"
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
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:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr "no comprobar CRLs para certificados raíz"
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr "Opciones que controlan el formato de la salida"
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr "Opciones que controlan la interactividad y obligación"
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
#, fuzzy
#| msgid "Options controlling the security"
msgid "Options controlling the use of Tor"
msgstr "Opciones que controlan la seguridad"
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr "Configuración de servidores HTTP"
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr "usar configuración del proxy HTTP del sistema"
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr "Configuración de servidores LDAP que se usará"
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr "lista de servidores LDAP"
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr "Configuración de OCSP"
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
#, fuzzy
#| msgid "network error"
msgid "Network"
@@@ -11222,122 -8985,98 +11217,122 @@@ msgstr "error de red
# ¿Por qué los ingleses entonces sí que saben lo que es un "passphrase"?
# ¿Es que son más listos? :-)
#
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
#| msgid "Bad Passphrase"
msgid "Passphrase Entry"
msgstr "Frase contraseña errónea"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
#, fuzzy
#| msgid "Component not found"
msgid "Component not suitable for launching"
msgstr "Componente no encontrado"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr "Verificación externa del componente %s fallida"
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr "Note que las especificación de grupo se ignoran\n"
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error closing '%s'\n"
msgstr "error cerrando %s: %s\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error parsing '%s'\n"
msgstr "error en `%s': %s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr "listar todos los componentes"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr "comprobar todos los programas"
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr "|COMPONENTE|lista de opciones"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr "|COMPONENTE|cambiar opciones"
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr "|COMPONENTE|comprobar opciones"
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr "aplicar valores globales por defecto"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
#, fuzzy
#| msgid "|FILE|take policy information from FILE"
msgid "|FILE|update configuration files using FILE"
msgstr "|FICHERO|tomar política de información de FICHERO"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
#, fuzzy
#| msgid "get the configuration directories for gpgconf"
msgid "get the configuration directories for @GPGCONF@"
msgstr "obtener directorios de configuración para gpgconf"
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
msgid "list global configuration file"
msgstr "listar fichero de configuración global"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
msgid "check global configuration file"
msgstr "comprobar fichero global de configuración"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "actualiza la base de datos de confianza"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
#, fuzzy
#| msgid "list all components"
msgid "reload all or a given component"
msgstr "listar todos los componentes"
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
#, fuzzy
#| msgid "list all components"
msgid "launch a given component"
msgstr "listar todos los componentes"
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
#, fuzzy
#| msgid "list all components"
msgid "kill a given component"
msgstr "listar todos los componentes"
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "usa como fichero de salida"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr "activar cambios en tiempo de ejecución, si es posible"
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
#, 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:131
++#: tools/gpgconf.c:139
#, fuzzy
#| msgid ""
#| "Syntax: gpgconf [options]\n"
@@@ -11349,15 -9088,12 +11344,15 @@@ msgstr "
"Sintaxis: gpgconf [opciones]\n"
"Administrar opciones de configuración de las herramientas GnuPG\n"
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr "Necesita un argumento de un componente"
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
msgid "Component not found"
msgstr "Componente no encontrado"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
msgid "No argument allowed"
msgstr "No se permiten parámetros"
diff --cc po/et.po
index 778adf0,b6a12e4..3c882c1
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2004-06-17 11:04+0300\n"
"Last-Translator: Toomas Soome <Toomas.Soome at microlink.ee>\n"
"Language-Team: Estonian <et at li.org>\n"
@@@ -155,26 -126,11 +155,26 @@@ msgstr "halb parool
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "kaitse algoritm %d%s ei ole toetatud\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -379,8 -296,6 +379,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "muuda parooli"
- #: agent/gpg-agent.c:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -390,124 -305,92 +390,124 @@@ msgstr "
"Võtmed:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "Võti on asendatud"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "ole jutukas"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ole mõnevõrra vaiksem"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "otsi võtmeid võtmeserverist"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "uuenda usalduse andmebaasi"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, 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:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "viga parooli loomisel: %s\n"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
#, fuzzy
msgid "allow presetting passphrase"
msgstr "viga parooli loomisel: %s\n"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "ei ole toetatud"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -516,167 -399,119 +516,162 @@@ msgstr "ei ole toetatud
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "valitud lühendi algoritm ei ole lubatud\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 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:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, 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:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s ei õnnestu luua: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
#, 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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "viga parooli loomisel: %s\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
- #: agent/gpg-agent.c:2241 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:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "kirjutan salajase võtme faili `%s'\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
- #: agent/gpg-agent.c:2327
++#: agent/gpg-agent.c:2351
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: kataloogi ei õnnestu luua: %s\n"
- #: agent/gpg-agent.c:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2771
++#: agent/gpg-agent.c:2795
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: jätsin vahele: %s\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
@@@ -692,8 -525,6 +687,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -701,9 -532,6 +696,9 @@@ msgstr "
"@Käsud:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -757,8 -577,6 +752,8 @@@ msgstr "Katkesta
msgid "error while asking for the passphrase: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
@@@ -942,8 -725,6 +937,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
@@@ -1419,7 -1102,6 +1414,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
#, fuzzy
msgid "out of core\n"
msgstr "ei töödeldud"
@@@ -1478,8 -1149,6 +1473,8 @@@ msgstr "ei leia avalikku võtit %08lX:
msgid "waiting for lock %s...\n"
msgstr "kirjutan salajase võtme faili `%s'\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1664,8 -1296,6 +1659,8 @@@ msgstr "salajane võti ei ole kättesaa
msgid "OpenPGP card no. %s detected\n"
msgstr ""
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "seda ei saa teha pakettmoodis\n"
@@@ -1680,10 -1308,6 +1675,10 @@@ msgstr "See käsklus ei ole %s moodis l
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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Teie valik? "
@@@ -1745,17 -1356,11 +1740,17 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "vastavat avalikku võtit pole: %s\n"
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, 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:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
@@@ -1812,7 -1406,6 +1807,7 @@@ msgstr "Võtme genereerimine ebaõnnest
msgid "not an OpenPGP card"
msgstr "ei leia OpenPGP andmeid.\n"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
@@@ -1848,13 -1435,10 +1843,13 @@@ msgstr "Millist võtmepikkust te soovit
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr ""
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "ümardatud üles %u bitini\n"
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1909,9 -1483,6 +1904,9 @@@ msgstr " (%d) RSA (ainult krüpteerim
msgid " (3) Authentication key\n"
msgstr ""
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Vigane valik.\n"
@@@ -2052,22 -1593,14 +2047,22 @@@ msgstr "võti --output ei tööta sell
msgid "can't open '%s'\n"
msgstr "`%s' ei õnnestu avada\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "viga võtmebloki lugemisel: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "võtit '%s' ei leitud: %s\n"
@@@ -2163,8 -1678,6 +2158,8 @@@ msgid "
msgstr ""
"sümmetrilise šifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, 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"
@@@ -2193,7 -1702,6 +2188,7 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s krüptitud kasutajale: \"%s\"\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2320,27 -1804,21 +2315,27 @@@ msgstr "%s: jätsin vahele: %s\n
msgid "writing to '%s'\n"
msgstr "kirjutan faili `%s'\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, 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:1904
++#: g10/export.c:1909
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "kirjutan salajase võtme faili `%s'\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "HOIATUS: midagi ei eksporditud\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2351,13 -1828,10 +2346,13 @@@ msgstr "viga `%s' loomisel: %s\n
msgid "[User ID not found]"
msgstr "[Kasutaja id puudub]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "vigased impordi võtmed\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2367,62 -1840,51 +2362,62 @@@
msgid "error looking up: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "viga võtmehoidla `%s' loomisel: %s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "viga `%s' loomisel: %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "viga `%s' loomisel: %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
#, fuzzy
msgid "No fingerprint"
msgstr "näita sõrmejälge"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "salajast võtit `%s' ei leitud: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, 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/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "vigased impordi võtmed\n"
@@@ -2632,7 -2048,6 +2627,7 @@@ msgstr "kasuta kanoonilist tekstimoodi
msgid "|FILE|write output to FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "ära tee mingeid muutusi"
@@@ -3022,7 -2364,6 +3017,7 @@@ msgstr "%s:%d: vigased ekspordi võtmed
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n"
@@@ -3041,7 -2379,6 +3036,7 @@@ msgstr "%s ja %s ei ole koos lubatud!\n
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s ei oma koos mõtet!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr ""
@@@ -3050,7 -2386,6 +3045,7 @@@
msgid "will not run with insecure memory due to %s\n"
msgstr "kirjutan salajase võtme faili `%s'\n"
- #: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "valitud šifri algoritm ei ole lubatud\n"
@@@ -3115,8 -2436,6 +3110,8 @@@ msgstr "vigased isikliku pakkimise eeli
msgid "%s does not yet work with %s\n"
msgstr "%s ei tööta veel koos %s-ga\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "sõnumilühendi algoritm \"%s\" ei ole moodis %s lubatud\n"
@@@ -3246,7 -2539,6 +3241,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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
@@@ -4621,7 -3639,6 +4616,7 @@@ msgstr "Olete kindel, et soovite seda i
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Foto IDd ei saa PGP2 võtmele lisada.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr ""
@@@ -4925,54 -3881,42 +4920,54 @@@ msgstr "liiga palju `%c' eelistusi\n
msgid "too many compression preferences\n"
msgstr "liiga palju `%c' eelistusi\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "lubamatu sümbol eelistuste sõnes\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "kirjutan otsese allkirja\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "kirjutan iseenda allkirja\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "kirjutan võtit siduva allkirja\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "vigane võtme suurus; kasutan %u bitti\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "võtme suurus ümardatud üles %u bitini\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
#, fuzzy
msgid "Sign"
msgstr "sign"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
#, fuzzy
msgid "Encrypt"
msgstr "krüpteeri andmed"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr ""
@@@ -4986,157 -3930,126 +4981,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (ainult krüptimiseks)\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA ja ElGamal (vaikimisi)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA ja ElGamal (vaikimisi)\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (ainult allkirjastamiseks)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (ainult allkirjastamiseks)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (ainult krüptimiseks)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA ja ElGamal (vaikimisi)\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (ainult allkirjastamiseks)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Allkirja noteerimine: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "ümardatud üles %u bitini\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Millist võtmepikkust te soovite? (1024) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Millist võtmepikkust te soovite? (1024) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Soovitud võtmepikkus on %u bitti\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5152,7 -4065,6 +5147,7 @@@ msgstr "
" <n>m = võti aegub n kuuga\n"
" <n>y = võti aegub n aastaga\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5168,40 -4080,32 +5163,40 @@@ msgstr "
" <n>m = allkiri aegub n kuuga\n"
" <n>y = allkiri aegub n aastaga\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "Võti on kehtiv kuni? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Allkiri on kehtiv kuni? (0) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "vigane väärtus\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s ei aegu kunagi\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s ei aegu kunagi\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s aegub %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Allkiri aegub %s\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5209,12 -4113,10 +5204,12 @@@ msgstr "
"Teie süsteem ei saa esitada kuupäevi peale aastat 2038.\n"
"Siiski käsitletakse neid korrektselt aastani 2106.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "On see õige (j/e)? "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5225,7 -4127,6 +5220,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
#, fuzzy
msgid ""
"\n"
@@@ -5241,50 -4142,39 +5236,50 @@@ msgstr "
" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Pärisnimi: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Lubamatu sümbol nimes\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "Nimi ei või alata numbriga\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "Nimes peab olema vähemalt 5 sümbolit\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "E-posti aadress: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "Selline e-posti aadress ei ole lubatud\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Kommentaar: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Lubamatu sümbol kommentaaris\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Te kasutate kooditabelit `%s'.\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5295,7 -4185,6 +5290,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Ärge palun kirjutage e-posti aadressi pärisnimesse ega kommentaari\n"
@@@ -5310,35 -4199,28 +5305,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoVv"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (V)älju? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (O)k/(V)älju? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (V)älju? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (O)k/(V)älju? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Palun parandage kõigepealt viga\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
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"
@@@ -5350,13 -4232,10 +5345,13 @@@ msgstr "
"kasutada kettaid jne), see annaks juhuarvude generaatorile võimaluse\n"
"koguda paremat entroopiat.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Võtme genereerimine ebaõnnestus: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5364,66 -4243,53 +5359,66 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' on juba pakitud\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "Kasutan seda võtit ikka? "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
#, fuzzy
msgid "creating anyway\n"
msgstr "genereeri uus võtmepaar"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Võtme genereerimine katkestati.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "`%s' ei õnnestu luua: %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "MÄRKUS: salajane võti %08lX aegus %s\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "kirjutan avaliku võtme faili `%s'\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjutatavat avalike võtmete hoidlat pole: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "viga avaliku võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "avalik ja salajane võti on loodud ja allkirjastatud.\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5433,34 -4299,28 +5428,34 @@@ msgstr "
"Krüptimiseks tuleb genereerida teine võti, seda saate teha\n"
"kasutades võtit \"--edit-key\".\n"
- #: g10/keygen.c:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, 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:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, 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:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
#, 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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
msgid "Secret parts of primary key are not available.\n"
msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
#, 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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Loon tõesti? "
@@@ -6203,23 -4917,18 +6198,23 @@@ msgstr "On see foto õige (j/E/v)?
msgid "unable to display photo ID!\n"
msgstr "foto ID ei saa näidata!\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Põhjus puudub"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "Võti on asendatud"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "Võti on kompromiteeritud"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "Võti ei ole enam kasutusel"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "Kasutaja ID ei ole enam kehtiv"
@@@ -6300,7 -4996,6 +6295,7 @@@ msgid "
"\n"
msgstr ""
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Teie otsus? "
@@@ -6445,46 -5112,37 +6440,46 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Ei ole kindel, et allkiri kuulub omanikule.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: jätsin vahele: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: jätsin vahele: avalik võti on blokeeritud\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: jätsin vahele: avalik võti on juba olemas\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "vigane räsialgoritm `%s'\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "vigane räsialgoritm `%s'\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Te ei määranud kasutaja IDd. (võite kasutada võtit \"-r\")\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6492,37 -5150,29 +6487,37 @@@ msgstr "
"\n"
"Sisestage kasutaja ID. Lõpetage tühja reaga: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Tundmatu kasutaja ID.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "jätsin vahele: avalik võti on juba vaikimisi saaja\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "Avalik võti on blokeeritud.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "jätsin vahele: avalik võti on juba olemas\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "kehtivaid aadresse pole\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "võti %08lX: kasutaja ID puudub\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "võti %08lX: kasutaja ID puudub\n"
@@@ -6627,7 -5255,6 +6622,7 @@@ msgstr "Salajane võti on kasutatav.\n
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "Väljundis sunnitakse kasutama ASCII vormingut.\n"
@@@ -6647,19 -5271,16 +6642,19 @@@ msgstr "
"`%s' jaoks pole tühistamise võtmeid\n"
"\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6668,20 -5289,17 +6663,20 @@@
"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:577
++#: g10/revoke.c:590
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Tühistamise sertifikaat on loodud.\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "salajast võtit `%s' ei leitud: %s\n"
@@@ -6689,23 -5307,19 +6684,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "viga võtmehoidla `%s' loomisel: %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6726,33 -5340,26 +6721,33 @@@ msgstr "
"trükisüsteem\n"
"võib salvestada need andmed ja teha teistele kättesaadavaks! \n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Palun valige tühistamise põhjus:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Katkesta"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Tõenäoliselt soovite siin valida %d)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Sisestage mittekohustuslik kirjeldus. Lõpetage tühja reaga:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Tühistamise põhjus: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(Kirjeldust ei antud)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "On see hästi? "
@@@ -7150,10 -5683,6 +7145,10 @@@ msgstr "viga parooli loomisel: %s\n
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
@@@ -7185,7 -5709,6 +7180,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
@@@ -7497,18 -5971,14 +7492,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7572,7 -6030,6 +7567,7 @@@ msgstr "
msgid "no need for a trustdb check\n"
msgstr "trustdb kontrolliks puudub vajadus\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "trustdb järgmine kontroll %s\n"
@@@ -7600,14 -6052,12 +7595,14 @@@ msgstr "palun tehke --check-trustdb\n
msgid "checking the trustdb\n"
msgstr "kontrollin trustdb faili\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "%lu võtit on seni töödeldud\n"
msgstr[1] "%lu võtit on seni töödeldud\n"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7615,22 -6065,18 +7610,22 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d võtit töödeldud (%d kehtivust puhastatud)\n"
msgstr[1] "%d võtit töödeldud (%d kehtivust puhastatud)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "absoluutselt usaldatavaid võtmeid pole\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "puudub absoluutselt usaldatava võtme %08lX avalik võti\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "usalduse kirje %lu, tüüp %d: kirjutamine ebaõnnestus: %s\n"
@@@ -8061,76 -6421,60 +8056,76 @@@ msgstr "muuda parooli
msgid "|N|Initial New PIN"
msgstr ""
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr ""
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
#, fuzzy
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NIMI|kasuta NIME vaikimisi saajana"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
#, fuzzy
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NIMI|kasuta NIME vaikimisi saajana"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
#, fuzzy
msgid "do not use the internal CCID driver"
msgstr "ära kasuta terminali"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr ""
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr ""
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
#, fuzzy
msgid "deny the use of admin card commands"
msgstr "vastuolulised käsud\n"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8848,7 -7039,6 +8843,7 @@@ msgstr "lisa see võtmehoidla võtmehoi
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|kasuta seda võtmeserverit"
@@@ -8908,17 -7088,14 +8903,17 @@@ msgstr " j = jäta see võti vahele\n
msgid "could not parse keyserver\n"
msgstr "ei saa parsida võtmeserveri URI\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "kirjutan faili `%s'\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "`%s' ei õnnestu sulgeda: %s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9869,116 -7856,88 +9864,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
#, fuzzy
msgid "run without asking a user"
msgstr "Väljun salvestamata? "
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "ei saa parsida võtmeserveri URI\n"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9991,91 -7950,72 +9986,91 @@@ msgstr "
"@\n"
"(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "kasuta: gpg [võtmed] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
#, 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:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "pakendamine ebaõnnestus: %s\n"
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "pakendamine ebaõnnestus: %s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "rida on liiga pikk\n"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "viga: vigane sõrmejälg\n"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "viga lugemisel: %s\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
#, fuzzy
msgid "shutdown forced\n"
msgstr "ei töödeldud"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10519,77 -8368,61 +10514,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "allkirjastamine ebaõnnestus: %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "allkirjastamine ebaõnnestus: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "`%s' ei õnnestu luua: %s\n"
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
#, 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:2632
++#: dirmngr/server.c:2738
#, 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:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10633,7 -8458,6 +10628,7 @@@ msgstr "eelistus %c%lu on duplikaat\n
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
#, fuzzy
msgid "quiet"
msgstr "välju"
@@@ -10726,286 -8530,218 +10721,286 @@@ 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr ""
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr ""
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|kasuta parooli moodi N"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "viga parooli loomisel: %s\n"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NIMI|krüpti NIMEle"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "ei saa parsida võtmeserveri URI\n"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NIMI|kasuta paroolidega šifri algoritmi NIMI"
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "võrgu viga"
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
msgid "Passphrase Entry"
msgstr "halb parool"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
#, fuzzy
msgid "Component not suitable for launching"
msgstr "ei leia avalikku võtit"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
#, fuzzy
msgid "list global configuration file"
msgstr "tundmatu seade \"%s\"\n"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
#, fuzzy
msgid "check global configuration file"
msgstr "tundmatu seade \"%s\"\n"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "uuenda usalduse andmebaasi"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "kasuta väljundfailina"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
#, fuzzy
msgid "Component not found"
msgstr "ei leia avalikku võtit"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
#, fuzzy
msgid "No argument allowed"
msgstr "kirjutan salajase võtme faili `%s'\n"
diff --cc po/fi.po
index 1ba7b6c,96ed735..1b2cdec
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2004-06-16 22:40+0300\n"
"Last-Translator: Tommi Vainikainen <Tommi.Vainikainen at iki.fi>\n"
"Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@@ -171,26 -142,11 +171,26 @@@ msgstr "väärä salasana
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -395,8 -312,6 +395,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "muuta salasanaa"
- #: agent/gpg-agent.c:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -406,124 -321,92 +406,124 @@@ msgstr "
"Valitsimet:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "Avain on uusittu"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "monisanainen"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ole jonkinverran hiljaisempi"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "etsi avaimia avainpalvelimelta"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "päivitä luottamustietokanta"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, 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:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
#, fuzzy
msgid "allow presetting passphrase"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "ei tuettu"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -532,168 -415,120 +532,163 @@@ msgstr "ei tuettu
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "valittu tiivistealgoritmi ei kelpaa\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 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:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, 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:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "ei voida luoda kohdetta %s: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
#, 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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, 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:2241 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:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
- #: agent/gpg-agent.c:2327
++#: agent/gpg-agent.c:2351
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: hakemistoa ei voi luoda: %s\n"
- #: agent/gpg-agent.c:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2771
++#: agent/gpg-agent.c:2795
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "salaisen päivitys epäonnistui: %s\n"
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ohitettu: %s\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
@@@ -709,8 -542,6 +704,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -718,9 -549,6 +713,9 @@@ msgstr "
"@Komennot:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -774,8 -594,6 +769,8 @@@ msgstr "Peru
msgid "error while asking for the passphrase: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -959,8 -742,6 +954,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -1436,7 -1119,6 +1431,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
#, fuzzy
msgid "out of core\n"
msgstr "ei käsitelty"
@@@ -1495,8 -1166,6 +1490,8 @@@ msgstr "julkista avainta %08lX ei löyd
msgid "waiting for lock %s...\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1683,8 -1315,6 +1678,8 @@@ msgstr "salaista avainta ei löydy
msgid "OpenPGP card no. %s detected\n"
msgstr ""
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "tätä ei voi tehdä eräajossa\n"
@@@ -1699,10 -1327,6 +1694,10 @@@ msgstr "Tätä komentoa ei sallita %s-t
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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Valintasi? "
@@@ -1764,17 -1375,11 +1759,17 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "ei vastaavaa julkista avainta: %s\n"
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, 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:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
@@@ -1831,7 -1425,6 +1826,7 @@@ msgstr "Avaimen luonti epäonnistui: %s
msgid "not an OpenPGP card"
msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
@@@ -1867,13 -1454,10 +1862,13 @@@ msgstr "Minkä kokoisen avaimen haluat
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr ""
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "pyöristetty %u bittiin\n"
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1928,9 -1502,6 +1923,9 @@@ msgstr " (%d) RSA (vain salaus)\n
msgid " (3) Authentication key\n"
msgstr ""
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Valinta ei kelpaa.\n"
@@@ -2071,22 -1612,14 +2066,22 @@@ msgstr "--output ei toimi yhdessä täm
msgid "can't open '%s'\n"
msgstr "tiedostoa \"%s\" ei voi avata\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "virhe luettaessa avainlohkoa: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
@@@ -2181,8 -1696,6 +2176,8 @@@ 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:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, 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"
@@@ -2209,7 -1718,6 +2204,7 @@@ msgstr "valittu symmetrinen salain %s (
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2335,27 -1819,21 +2330,27 @@@ msgstr "%s: ohitettu: %s\n
msgid "writing to '%s'\n"
msgstr "kirjoitetaan kohteeseen \"%s\"\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, 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:1904
++#: g10/export.c:1909
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "VAROITUS: mitään ei viety\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2366,13 -1843,10 +2361,13 @@@ msgstr "virhe luotaessa \"%s\": %s\n
msgid "[User ID not found]"
msgstr "[Käyttäjätunnusta ei löytynyt]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2382,62 -1855,51 +2377,62 @@@
msgid "error looking up: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "virhe luotaessa \"%s\": %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "virhe luotaessa \"%s\": %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
#, fuzzy
msgid "No fingerprint"
msgstr "näytä sormenjälki"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "salaista avainta \"%s\" ei löydy: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, 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/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "virheelliset tuontivalitsimet\n"
@@@ -2647,7 -2063,6 +2642,7 @@@ msgstr "käytä tekstimuotoa
msgid "|FILE|write output to FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "älä tee muutoksia"
@@@ -3037,7 -2379,6 +3032,7 @@@ msgstr "%s:%d: virheelliset vientivalit
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
@@@ -3056,7 -2394,6 +3051,7 @@@ msgstr "%s ja %s eivät ole sallittuja
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s yhdessä on järjetöntä!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr ""
@@@ -3065,7 -2401,6 +3060,7 @@@
msgid "will not run with insecure memory due to %s\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
@@@ -3131,8 -2452,6 +3126,8 @@@ msgstr "virheelliset henkilökohtaiset
msgid "%s does not yet work with %s\n"
msgstr "%s ja %s eivät vielä toimi yhdessä\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
@@@ -3262,7 -2555,6 +3257,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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
@@@ -4641,7 -3659,6 +4636,7 @@@ msgstr "Haluatko edelleen varmasti lis�
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Et voi lisätä valokuvaa PGP2-muodon avaimeen.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr ""
@@@ -4950,54 -3906,42 +4945,54 @@@ msgstr "liian monta \"%c\" valintaa\n
msgid "too many compression preferences\n"
msgstr "liian monta \"%c\" valintaa\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "Valinnassa on luvaton merkki\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "kirjoitetaan suora allekirjoitus\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "kirjoitetaan oma-allekirjoitus\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "avaimen koko on pyöristetty %u bittiin\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
#, fuzzy
msgid "Sign"
msgstr "sign"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
#, fuzzy
msgid "Encrypt"
msgstr "salaa tiedot"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr ""
@@@ -5011,157 -3955,126 +5006,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (vain salaus)\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Valitse millaisen avaimen haluat:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA ja ElGamal (oletus)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA ja ElGamal (oletus)\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (vain allekirjoitus)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (vain allekirjoitus)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (vain salaus)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (vain salaus)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (vain salaus)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (vain salaus)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA ja ElGamal (oletus)\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (vain allekirjoitus)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (vain salaus)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (vain salaus)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (vain salaus)\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Allekirjoitusnotaatio: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "pyöristetty %u bittiin\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Minkä kokoisen avaimen haluat? (1024) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Minkä kokoisen avaimen haluat? (1024) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Halutun avaimen koko on %u bittiä\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Valitse millaisen avaimen haluat:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5177,7 -4090,6 +5172,7 @@@ msgstr "
" <n>m = Avain vanhenee n kuukauden kuluttua\n"
" <n>y = Avain vanhenee n vuoden kuluttua\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5193,40 -4105,32 +5188,40 @@@ msgstr "
" <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
" <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "Avain on voimassa? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Allekirjoitus on voimassa? (0) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "arvo ei kelpaa\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s ei vanhene koskaan\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s ei vanhene koskaan\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s vanhenee %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Allekirjoitus vanhenee %s\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5234,12 -4138,10 +5229,12 @@@ msgstr "
"Järjestelmäsi ei osaa näyttää päiväyksiä kuin vuoteen 2038.\n"
"Se kuitenkin käsittelee päiväykset oikein vuoteen 2106.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Onko tämä oikein (k/e) "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5250,7 -4152,6 +5245,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
#, fuzzy
msgid ""
"\n"
@@@ -5268,50 -4169,39 +5263,50 @@@ msgstr "
" \"Matti Meikäläinen (nuorempi) <matti.meikalainen at osoite.fi>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Oikea nimi: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Nimessä on epäkelpo merkki\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "Nimi ei voi alkaa numerolla\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "Sähköpostiosoite: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "Sähköpostiosoite ei kelpaa\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Huomautus: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Huomautuksessa on epäkelpo merkki\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Käytät merkistöä \"%s\".\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5322,7 -4212,6 +5317,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
@@@ -5337,35 -4226,28 +5332,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnHhSsOoLl"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Ole hyvä ja korjaa ensin virhe\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
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"
@@@ -5377,13 -4259,10 +5372,13 @@@ msgstr "
"alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
"paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Avaimen luonti epäonnistui: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5391,66 -4270,53 +5386,66 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "\"%s\" on jo pakattu\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
#, fuzzy
msgid "creating anyway\n"
msgstr "luo uusi avainpari"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Avaimen luonti keskeytetty.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "HUOM: salainen avain %08lX vanheni %s\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5459,7 -4325,6 +5454,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:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5467,7 -4332,6 +5462,7 @@@ msgstr "
"avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
- #: g10/keygen.c:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5475,22 -4339,18 +5470,22 @@@ msgstr "
"avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
#, 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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
msgid "Secret parts of primary key are not available.\n"
msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
#, 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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Haluatko varmasti luoda? "
@@@ -6241,23 -4955,18 +6236,23 @@@ msgstr "Onko tämä oikein (k/E/l)?
msgid "unable to display photo ID!\n"
msgstr "valokuvatunnistetta ei voi näyttää!\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Ei eriteltyä syytä"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "Avain on uusittu"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "Avain on murrettu"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "Avain ei ole enää käytössä"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "Käyttäjätunnus ei ole enää käytössä"
@@@ -6338,7 -5034,6 +6333,7 @@@ msgid "
"\n"
msgstr ""
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Valintasi? "
@@@ -6492,46 -5159,37 +6487,46 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Ei ole varmaa, että allekirjoitus kuuluu haltijalle.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ohitettu: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s ohitettu: julkinen avain on poistettu käytöstä\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ohitettu: julkinen avain on jo olemassa\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Et määritellyt käyttäjätunnusta. (voit käyttää valitsinta \"-r\")\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6539,37 -5197,29 +6534,37 @@@ msgstr "
"\n"
"Syötä käyttäjätunnus. Lopeta tyhjällä rivillä: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Käyttäjätunnusta ei löydy.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "ohitettu: julkinen avain on jo asetettu oletusvastaanottajaksi\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "Julkinen avain on poistettu käytöstä\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "ohitettu: julkinen avain on jo asetettu\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "ei kelvollisia vastaanottajia\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "avain %08lX: ei käyttäjätunnusta\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "avain %08lX: ei käyttäjätunnusta\n"
@@@ -6675,7 -5303,6 +6670,7 @@@ msgstr "Salainen avain on saatavilla.\n
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Luo tälle avaimelle mitätöintivarmenne? "
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "ASCII-koodattu tuloste määritetty.\n"
@@@ -6693,19 -5317,16 +6688,19 @@@ msgstr "Mitätöintivarmenne luotu.\n
msgid "no revocation keys found for \"%s\"\n"
msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Luo tälle avaimelle mitätöintivarmenne? "
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6714,20 -5335,17 +6709,20 @@@
"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:577
++#: g10/revoke.c:590
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Mitätöintivarmenne luotu.\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "salaista avainta \"%s\" ei löydy: %s\n"
@@@ -6735,23 -5353,19 +6730,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Luo tälle avaimelle mitätöintivarmenne? "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6771,33 -5385,26 +6766,33 @@@ msgstr "
"tulostusjärjestelmä saattaa tallentaa datan ja saattaa sen muiden "
"saataville!\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Valitse mitätöinnin syy:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Peru"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Todennäköisesti haluat valita %d tässä)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Syötä vapaaehtoinen kuvaus; lopeta tyhjään riviin:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Mitätöinnin syy: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(Kuvausta ei annettu)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Kelpaako tämä? "
@@@ -7207,10 -5740,6 +7202,10 @@@ msgstr "virhe luotaessa salasanaa: %s\n
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
@@@ -7242,7 -5766,6 +7237,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
@@@ -7554,18 -6028,14 +7549,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7630,7 -6088,6 +7625,7 @@@ msgstr "
msgid "no need for a trustdb check\n"
msgstr "trustdb:n tarkistusta ei tarvita\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "seuraava trustdb tarkistus %s\n"
@@@ -7658,14 -6110,12 +7653,14 @@@ msgstr "tee --check-trustdb, kiitos\n
msgid "checking the trustdb\n"
msgstr "tarkistetaan trustdb:tä\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "tähän mennessä käsitelty %lu avainta\n"
msgstr[1] "tähän mennessä käsitelty %lu avainta\n"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7673,22 -6123,18 +7668,22 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
msgstr[1] "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@@ -8120,76 -6480,60 +8115,76 @@@ msgstr "muuta salasanaa
msgid "|N|Initial New PIN"
msgstr ""
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr ""
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
#, fuzzy
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
#, fuzzy
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
#, fuzzy
msgid "do not use the internal CCID driver"
msgstr "älä käytä lainkaan päätettä"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr ""
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr ""
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
#, fuzzy
msgid "deny the use of admin card commands"
msgstr "ristiriitainen komento\n"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8907,7 -7098,6 +8902,7 @@@ msgstr "lisää tämä avainrengas avai
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
@@@ -8967,17 -7147,14 +8962,17 @@@ msgstr " o = ohita tämä avain\n
msgid "could not parse keyserver\n"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "kirjoitetaan kohteeseen \"%s\"\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9930,116 -7917,88 +9925,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
#, fuzzy
msgid "run without asking a user"
msgstr "Lopeta tallentamatta muutoksia?"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10053,91 -8012,72 +10048,91 @@@ msgstr "
"(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
"sivuilta)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "käyttö: gpg [valitsimet] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
#, 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:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "rivi on liian pitkä\n"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "virhe: sormenjälki on väärä\n"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "lukuvirhe: %s\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
#, fuzzy
msgid "shutdown forced\n"
msgstr "ei käsitelty"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10581,77 -8430,61 +10576,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
#, 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:2632
++#: dirmngr/server.c:2738
#, 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:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10695,7 -8520,6 +10690,7 @@@ msgstr "valinta %c%lu on kopio\n
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
#, fuzzy
msgid "quiet"
msgstr "lopeta|sulje"
@@@ -10788,286 -8592,218 +10783,286 @@@ 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr ""
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr ""
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|käytä salasanoissa toimintatapaa N"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NIMI|salaa vastaanottajalle NIMI"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NIMI|käytä salasanoihin salausalgoritmia NIMI"
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "verkkovirhe"
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
msgid "Passphrase Entry"
msgstr "väärä salasana"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
#, fuzzy
msgid "Component not suitable for launching"
msgstr "julkista avainta ei löydy"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
#, fuzzy
msgid "list global configuration file"
msgstr "tuntematon asetus \"%s\"\n"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
#, fuzzy
msgid "check global configuration file"
msgstr "tuntematon asetus \"%s\"\n"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "päivitä luottamustietokanta"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "käytä tulostustiedostona"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
#, fuzzy
msgid "Component not found"
msgstr "julkista avainta ei löydy"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
#, fuzzy
msgid "No argument allowed"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
diff --cc po/fr.po
index f2c938d,30f61bb..b67e65f
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2017-11-02 17:40+0100\n"
"Last-Translator: David Prévot <david at tilapin.org>\n"
"Language-Team: French <traduc at traduc.org>\n"
@@@ -165,25 -136,10 +165,25 @@@ msgstr "Mauvaise phrase secrète
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "les clefs SSH plus grandes que %d bits ne sont pas prises en charge\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, c-format
msgid "can't open '%s': %s\n"
msgstr "impossible d'ouvrir « %s » : %s\n"
@@@ -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:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -401,119 -316,87 +401,119 @@@ msgstr "
"@Options :\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr "exécuter en mode démon (arrière-plan)"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr "exécuter en mode serveur (premier plan)"
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "run in server mode"
msgid "run in supervised mode"
msgstr "exécuter en mode serveur"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "bavard"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "devenir beaucoup plus silencieux"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr "sortie de commandes à la sh"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr "sortie de commandes à la csh"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|FICHIER|lire les options depuis le FICHIER"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr "ne pas détacher de la console"
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "utiliser un fichier journal pour le serveur"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PROG|utiliser PROG pour entrer le code personnel"
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PROG|utiliser PROG comme SCdaemon"
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
msgid "do not use the SCdaemon"
msgstr "ne pas utiliser le SCdaemon"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, 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:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr "ignorer les demandes de modification du TTY"
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr "ignorer les demandes de modification d'aff. X"
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|oublier les codes personnels après N secondes"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr "ne pas utiliser le cache de code pour signer"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, 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:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr "ne pas marquer les clefs comme de confiance"
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
msgid "allow presetting passphrase"
msgstr "permettre de préconfigurer la phrase secrète"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
msgid "enable ssh support"
msgstr "activer la prise en charge de SSH"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
msgid "enable putty support"
msgstr "activer la prise en charge de putty"
@@@ -521,21 -404,14 +521,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:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Utilisation : dirmngr @GPG_AGENT@ (-h pour l'aide)"
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -543,143 -419,102 +543,138 @@@ msgstr "
"Syntaxe : @GPG_AGENT@ [options] [commande [arguments]]\n"
"Gestionnaire de clefs secrètes pour @GNUPG@\n"
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "niveau de débogage « %s » incorrect\n"
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "la fonction de hachage sélectionnée est incorrecte\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "fichier d'options « %s » : %s\n"
- #: agent/gpg-agent.c:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, c-format
msgid "reading options from '%s'\n"
msgstr "lecture des options de « %s »\n"
- #: agent/gpg-agent.c:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, c-format
msgid "can't create socket: %s\n"
msgstr "impossible de créer la socket : %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, 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:2209
++#: agent/gpg-agent.c:2232
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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
msgid "error getting nonce for the socket\n"
msgstr "erreur de lecture du « nonce » de la socket\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "erreur de lien de la socket à « %s » : %s\n"
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, 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:2241 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:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, c-format
msgid "listening on socket '%s'\n"
msgstr "écoute sur la socket « %s »\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "échec de stat() pour « %s » : %s\n"
- #: agent/gpg-agent.c:2327
++#: agent/gpg-agent.c:2351
#, 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:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, 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:2686
++#: agent/gpg-agent.c:2710
#, 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:2691
++#: agent/gpg-agent.c:2715
#, 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:2766
++#: agent/gpg-agent.c:2790
#, 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:2771
++#: agent/gpg-agent.c:2795
#, 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:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "échec de npth_pselect : %s — attente 1 s\n"
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s arrêté\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
@@@ -697,8 -530,6 +692,8 @@@ msgstr "
"Syntaxe : gpg-preset-passphrase [options] KEYGRIP\n"
"Maintenance du cache des mots de passe\n"
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -706,9 -537,6 +701,9 @@@ msgstr "
"@Commandes :\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -764,8 -584,6 +759,8 @@@ msgstr "annulé\n
msgid "error while asking for the passphrase: %s\n"
msgstr "erreur de demande de la phrase secrète : %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, c-format
msgid "error opening '%s': %s\n"
msgstr "erreur d'ouverture de « %s » : %s\n"
@@@ -958,8 -741,6 +953,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, c-format
msgid "error forking process: %s\n"
msgstr "erreur de création de processus fils : %s\n"
@@@ -1400,7 -1083,6 +1395,7 @@@ msgstr "l'option « %.50s » est ambi
msgid "command \"%.50s\" is ambiguous\n"
msgstr "la commande « %.50s » est ambiguë\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
msgid "out of core\n"
msgstr "hors limite\n"
@@@ -1458,8 -1129,6 +1453,8 @@@ msgstr "verrou « %s » non effectif�
msgid "waiting for lock %s...\n"
msgstr "attente du verrou %s…\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s est trop ancien (nécessaire : %s, utilisé : %s)\n"
@@@ -1642,8 -1274,6 +1637,8 @@@ msgstr "la carte OpenPGP n'est pas disp
msgid "OpenPGP card no. %s detected\n"
msgstr "carte OpenPGP nº %s détectée\n"
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
msgid "can't do this in batch mode\n"
msgstr "impossible de faire cela en mode automatique\n"
@@@ -1655,10 -1283,6 +1650,10 @@@ msgstr "Cette commande n'est disponibl
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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Quel est votre choix ? "
@@@ -1715,16 -1326,10 +1710,16 @@@ 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:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, c-format
msgid "error reading '%s': %s\n"
msgstr "erreur de lecture de « %s » : %s\n"
- #: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "erreur d'écriture de « %s » : %s\n"
@@@ -1774,7 -1368,6 +1769,7 @@@ msgstr "opération sur la clef impossib
msgid "not an OpenPGP card"
msgstr "ce n'est pas une carte OpenPGP"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, c-format
msgid "error getting current key info: %s\n"
msgstr ""
@@@ -1818,13 -1405,10 +1813,13 @@@ msgid "The card will now be re-configur
msgstr ""
"La carte sera maintenant reconfigurée pour générer une clef de %u bits\n"
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrondie à %u bits\n"
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 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"
@@@ -1880,9 -1454,6 +1875,9 @@@ msgstr " (2) Clef de chiffrement\n
msgid " (3) Authentication key\n"
msgstr " (3) Clef d'authentification\n"
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Choix incorrect.\n"
@@@ -2016,22 -1557,14 +2011,22 @@@ msgstr "--output n'est pas compatible a
msgid "can't open '%s'\n"
msgstr "impossible d'ouvrir « %s »\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "erreur de lecture du bloc de clef : %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
#| msgid "key \"%s\" not found: %s\n"
msgid "key \"%s\" not found\n"
@@@ -2122,8 -1637,6 +2117,8 @@@ 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:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, 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"
@@@ -2156,7 -1665,6 +2151,7 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s chiffré pour : « %s »\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2276,26 -1760,20 +2271,26 @@@ msgstr " — ignoré
msgid "writing to '%s'\n"
msgstr "écriture de « %s »\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, 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:1904
++#: g10/export.c:1909
msgid "exporting secret keys not allowed\n"
msgstr "il est interdit d'exporter les clefs secrètes\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "Attention : rien n'a été exporté\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2304,14 -1781,11 +2299,14 @@@
msgid "[User ID not found]"
msgstr "[identité introuvable]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
msgstr "argument manquant pour l'option « %.50s »\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2322,63 -1795,52 +2317,63 @@@
msgid "error looking up: %s\n"
msgstr "erreur de fermeture de %s : %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring '%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "erreur de création du porte-clefs « %s » : %s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "« %s » automatiquement récupéré par %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "erreur de récupération de « %s » avec %s : %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
msgid "No fingerprint"
msgstr "Aucune empreinte"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "clef secrète « %s » introuvable : %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, 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/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
#| msgid "invalid argument for option \"%.50s\"\n"
msgid "valid values for option '%s':\n"
@@@ -2575,7 -1991,6 +2570,7 @@@ msgstr "utiliser le mode texte canoniqu
msgid "|FILE|write output to FILE"
msgstr "|FICHIER|écrire la sortie dans le FICHIER"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "ne rien modifier"
@@@ -2976,7 -2318,6 +2971,7 @@@ msgstr "%s : %d : liste de recherche
msgid "invalid auto-key-locate list\n"
msgstr "liste de recherche automatique de clef incorrecte\n"
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "Attention : le programme pourrait créer un fichier « core ».\n"
@@@ -2995,7 -2333,6 +2990,7 @@@ msgstr "%s n'est pas permis avec %s.\n
msgid "%s makes no sense with %s!\n"
msgstr "%s n'a aucun sens avec %s.\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr "Attention : exécution avec un système de temps contrefait : "
@@@ -3004,7 -2340,6 +2999,7 @@@
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:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorithme de chiffrement sélectionné est incorrect\n"
@@@ -3065,8 -2386,6 +3060,8 @@@ msgstr "préférences personnelles de c
msgid "%s does not yet work with %s\n"
msgstr "%s ne fonctionne pas encore avec %s\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 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"
@@@ -3199,7 -2492,6 +3194,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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|écrire l'état sur ce descripteur"
@@@ -4533,7 -3551,6 +4528,7 @@@ msgid "You may not add a photo ID to a
msgstr ""
"Vous ne devriez pas ajouter de photo d'identité à une clef de type PGP 2.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr "Cette identité existe déjà pour cette clef.\n"
@@@ -4841,57 -3797,45 +4836,57 @@@ msgstr "trop de préférences de hachag
msgid "too many compression preferences\n"
msgstr "trop de préférences de compression\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "élément « %s » incorrect dans la chaîne de préférences\n"
# g10/keygen.c:123 ???
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "écriture de la signature directe\n"
# g10/keygen.c:123 ???
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "écriture de l'autosignature\n"
# g10/keygen.c:161 ???
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "écriture de la signature de lien à la clef\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "taille incorrecte ; utilisation de %u bits\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "taille arrondie à %u bits\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"Attention : certains programmes OpenPGP ne peuvent pas gérer\n"
" de clef DSA avec cette taille de hachage\n"
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
msgid "Sign"
msgstr "Signer"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr "Certifier"
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
msgid "Encrypt"
msgstr "Chiffrer"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr "Authentifier"
@@@ -4905,150 -3849,119 +4900,150 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr "SsCcAaQq"
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Actions possibles pour une clef %s : "
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr "Actions actuellement permises : "
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Inverser la capacité de signature\n"
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Inverser la capacité de chiffrement\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Inverser la capacité d'authentification\n"
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Terminé\n"
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Sélectionnez le type de clef désiré :\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA et RSA (par défaut)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA et Elgamal\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (signature seule)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (signature seule)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (chiffrement seul)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (chiffrement seul)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (indiquez vous-même les capacités)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (indiquez vous-même les capacités)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) ECC et ECC\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, c-format
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) ECC (signature seule)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) ECC (indiquez vous-même les capacités)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, c-format
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) ECC (chiffrement seul)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) Clef existante\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
msgid "Enter the keygrip: "
msgstr "Entrez le keygrip : "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "Ce n'est pas un keygrip valable (40 chiffres hexadécimaux attendus)\n"
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
msgid "No key with this keygrip\n"
msgstr "Pas de clef avec ce keygrip\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, c-format
msgid "rounded to %u bits\n"
msgstr "arrondie à %u bits\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "les clefs %s peuvent faire une taille comprise entre %u et %u bits.\n"
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Quelle taille de clef désirez-vous pour la sous-clef ? (%u) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Quelle taille de clef désirez-vous ? (%u) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "La taille demandée est %u bits\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
msgid "Please select which elliptic curve you want:\n"
msgstr "Sélectionnez le type de courbe elliptique désiré :\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5064,7 -3977,6 +5059,7 @@@ msgstr "
" <n>m = la clef expire dans n mois\n"
" <n>y = la clef expire dans n ans\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5081,38 -3993,30 +5076,38 @@@ msgstr "
" <n>m = la signature expire dans n mois\n"
" <n>y = la signature expire dans n ans\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "Pendant combien de temps la clef est-elle valable ? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Pendant combien de temps la signature est-elle valable ? (%s) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "valeur incorrecte\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
msgid "Key does not expire at all\n"
msgstr "La clef n'expire pas du tout\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
msgid "Signature does not expire at all\n"
msgstr "La signature n'expire pas du tout\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, c-format
msgid "Key expires at %s\n"
msgstr "La clef expire le %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, c-format
msgid "Signature expires at %s\n"
msgstr "La signature expire le %s\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5120,11 -4024,9 +5115,11 @@@ msgstr "
"Le système ne peut pas afficher les dates au-delà de 2038.\n"
"Cependant, la gestion des dates sera correcte jusqu'en 2106.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
msgid "Is this correct? (y/N) "
msgstr "Est-ce correct ? (o/N) "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5138,7 -4040,6 +5133,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5154,49 -4055,38 +5149,49 @@@ msgstr "
" « Heinrich Heine (le poète) <heinrichh at duesseldorf.de> »\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Nom réel : "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Caractère incorrect dans le nom\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "Le nom ne doit pas commencer par un chiffre\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "Le nom doit contenir au moins cinq caractères\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "Adresse électronique : "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "Ce n'est pas une adresse électronique valable\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Commentaire : "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Caractère incorrect dans le commentaire\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "Vous utilisez le jeu de caractères « %s ».\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5207,7 -4097,6 +5202,7 @@@ msgstr "
" « %s »\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Ne mettez pas d'adresse électronique dans le nom réel ou dans le "
@@@ -5224,34 -4113,27 +5219,34 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnCcAaOoQq"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr ""
"Changer le (N)om, le (C)ommentaire, l'(A)dresse électronique ou (Q)uitter ? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Changer le (N)om, le (C)ommentaire, l'(A)dresse électronique\n"
"ou (O)ui/(Q)uitter ? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Changer le (N)om, l’(A)dresse électronique ou (Q)uitter ? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Changer le (N)om, l'(A)dresse électronique ou (O)ui/(Q)uitter ? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Veuillez d'abord corriger l'erreur\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
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"
@@@ -5263,13 -4145,10 +5258,13 @@@ msgstr "
"pendant la génération de nombres premiers ; cela donne au générateur de\n"
"nombres aléatoires une meilleure chance d'obtenir suffisamment d'entropie.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Échec de génération de la clef : %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5280,64 -4159,51 +5275,64 @@@ msgstr "
" « %s »\n"
"\n"
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr "Faut-il continuer ? (O/n) "
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Une clef pour « %s » existe déjà\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
msgid "Create anyway? (y/N) "
msgstr "Faut-il quand même créer ? (o/N) "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
msgid "creating anyway\n"
msgstr "création quand même\n"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
"Remarque : Utilisez « %s %s » pour une fenêtre de dialogue de génération de "
"clef complète.\n"
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "La génération de clef a été annulée.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "impossible de créer le fichier de sauvegarde « %s » : %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "Remarque : sauvegarde de la clef de la carte dans « %s »\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, c-format
msgid "writing public key to '%s'\n"
msgstr "écriture de la clef publique dans « %s »\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "aucun porte-clefs public accessible en écriture n'a été trouvé : %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "erreur d'écriture du porte-clefs public « %s » : %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
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:4837
++#: g10/keygen.c:4859
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"
@@@ -5346,7 -4212,6 +5341,7 @@@ msgstr "
"pouvez\n"
"utiliser la commande « --edit-key » pour générer une sous-clef à cette fin.\n"
- #: g10/keygen.c:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5354,7 -4219,6 +5349,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:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5362,22 -4226,18 +5357,22 @@@ msgstr "
"la clef a été créée %lu secondes dans le futur (faille temporelle ou\n"
"problème d'horloge)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
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:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
msgid "Really create? (y/N) "
msgstr "Faut-il vraiment la créer ? (o/N) "
@@@ -6136,23 -4850,18 +6131,23 @@@ msgstr "Cette photo est-elle correcte (
msgid "unable to display photo ID!\n"
msgstr "impossible d'afficher la photo d'identité.\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Aucune cause indiquée"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "La clef a été remplacée"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "La clef a été compromise"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "La clef n'est plus utilisée"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "L'identité n'est plus valable"
@@@ -6230,7 -4926,6 +6225,7 @@@ msgstr "
"Le niveau de confiance minimal pour cette clef est : %s\n"
"\n"
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Quelle est votre décision ? "
@@@ -6386,48 -5053,39 +6381,48 @@@ msgstr "
" Aucune certitude que la signature appartienne à son "
"propriétaire.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s : ignoré : %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s : ignoré : la clef publique est désactivée\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s : ignoré : clef publique déjà présente\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to '%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "impossible de se connecter à « %s » : %s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
#| msgid "line %d: invalid date given\n"
msgid "option '%s' given, but no valid default keys given\n"
msgstr "ligne %d : date donnée incorrect\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
#| msgid "line %d: invalid date given\n"
msgid "option '%s' given, but option '%s' not given\n"
msgstr "ligne %d : date donnée incorrect\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Vous n'avez pas indiqué d'identité (vous pouvez utiliser « -r »).\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr "Destinataires actuels :\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6435,38 -5093,30 +6430,38 @@@ msgstr "
"\n"
"Entrez l'identité, en terminant par une ligne vide : "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Cette identité n'existe pas.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr ""
"ignoré : la clef publique est déjà définie en destinataire par défaut\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "La clef publique est désactivée.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "ignoré : clef publique déjà activée\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinataire par défaut « %s » inconnu\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "pas de destinataire valable\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Remarque : la clef %s n'a pas de fonctionnalité %s\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Remarque : la clef %s n'a pas de préférence pour %s\n"
@@@ -6574,7 -5202,6 +6569,7 @@@ msgid "Create a designated revocation c
msgstr ""
"Faut-il créer un certificat de révocation désigné pour cette clef ? (o/N) "
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "sortie forcée avec armure ASCII.\n"
@@@ -6592,18 -5216,15 +6587,18 @@@ msgstr "Certificat de révocation cré�
msgid "no revocation keys found for \"%s\"\n"
msgstr "aucune clef de révocation trouvée pour « %s »\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Ceci est un certificat de révocation pour la clef OpenPGP :"
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
#, fuzzy
#| msgid ""
#| "Use it to revoke this key in case of a compromise or loss of\n"
@@@ -6622,7 -5243,6 +6617,7 @@@ msgstr "
"encore accessible, créer un nouveau certificat de révocation\n"
"est préférable afin d’indiquer la cause de révocation."
- #: g10/revoke.c:577
++#: g10/revoke.c:590
#, fuzzy
#| msgid ""
#| "To avoid an accidental use of this file, a colon has been inserted\n"
@@@ -6638,13 -5258,11 +6633,13 @@@ msgstr "
"Supprimez ce deux-points avec un éditeur de texte avant\n"
"d’utiliser ce certificat de révocation."
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Certificat de révocation créé.\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6653,22 -5271,18 +6648,22 @@@ msgstr "clef secrète « %s » introu
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring '%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "erreur de création du porte-clefs « %s » : %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Faut-il créer un certificat de révocation pour cette clef ? (o/N) "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6689,34 -5303,27 +6684,34 @@@ msgstr "
"d'impression\n"
"utilisé pourrait stocker ces données et les rendre accessibles à d'autres.\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "choisissez la cause de la révocation :\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Annuler"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Vous devriez sûrement sélectionner %d ici)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr ""
"Entrez une description facultative, en terminant par une ligne vide :\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Cause de révocation : %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(Aucune description donnée)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
msgid "Is this okay? (y/N) "
msgstr "Est-ce d'accord ? (o/N) "
@@@ -7137,10 -5670,6 +7132,10 @@@ msgstr "erreur de création du fichier
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error reading TOFU database: %s\n"
@@@ -7175,7 -5699,6 +7170,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "erreur d'ouverture de « %s » : %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error updating TOFU database: %s\n"
@@@ -7499,19 -5973,15 +7494,19 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, 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:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring '%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7578,7 -6036,6 +7573,7 @@@ msgstr "utilisation du modèle de confi
msgid "no need for a trustdb check\n"
msgstr "inutile de vérifier la base de confiance\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "la prochaine vérification de la base de confiance aura lieu le %s\n"
@@@ -7610,7 -6062,6 +7605,7 @@@ msgstr "veuillez faire un --check-trust
msgid "checking the trustdb\n"
msgstr "vérification de la base de confiance\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
#| msgid "%lu keys processed so far\n"
msgid "%d key processed"
@@@ -7618,7 -6069,6 +7613,7 @@@ msgid_plural "%d keys processed
msgstr[0] "%lu clefs traitées jusqu'à présent\n"
msgstr[1] "%lu clefs traitées jusqu'à présent\n"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7626,16 -6076,13 +7621,16 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d clefs traitées (%d comptes de validité réinitialisés)\n"
msgstr[1] "%d clefs traitées (%d comptes de validité réinitialisés)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "aucune clef de confiance ultime n'a été trouvée\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "la clef publique de la clef de confiance ultime %s est introuvable\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7643,7 -6090,6 +7638,7 @@@ msgstr "
"profondeur : %d valables : %3d signées : %3d\n"
" confiance : %d i., %d n.d., %d j., %d m., %d t., %d u.\n"
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -8092,55 -6452,42 +8087,55 @@@ msgstr "
msgid "|N|Initial New PIN"
msgstr "|N|Nouveau code personnel initial"
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr "exécuter en mode multiserveur (premier plan)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
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:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
msgid "|FILE|write a log to FILE"
msgstr "|FICHIER|écrire un journal dans le FICHIER"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr "|N|se connecter au lecteur par le port N"
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NOM|utiliser NOM comme pilote ct-API"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NOM|utiliser NOM comme pilote PC/SC"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
msgid "do not use the internal CCID driver"
msgstr "ne pas utiliser le pilote CCID interne"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr "|N|déconnecter la carte après N secondes d'inactivité "
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr "ne pas utiliser de pavé numérique du lecteur"
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
msgid "deny the use of admin card commands"
msgstr "refus d'utiliser les commandes d'administration de la carte"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr "utiliser une entrée de taille variable pour le pavé numérique"
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Utilisation : @SCDAEMON@ [options] (-h pour l'aide)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
@@@ -8148,18 -6495,15 +8143,18 @@@ msgstr "
"Syntaxe : scdaemon [options] [commande [arguments]]\n"
"Démon de carte à puce pour @GNUPG@\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
"veuillez utiliser l'option « --daemon » pour exécuter le programme\n"
"en arrière-plan\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr "gestionnaire pour le descripteur %d démarré\n"
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "gestionnaire pour le descripteur %d terminé\n"
@@@ -8859,7 -7050,6 +8854,7 @@@ msgstr "|FICHIER|ajouter le trousseau �
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|IDENTITÉ| utiliser IDENTITÉ comme clef secr. par défaut"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|utiliser ce serveur pour rechercher les clefs"
@@@ -8914,17 -7094,14 +8909,17 @@@ msgstr "%s : %u : ignorer cette ligne
msgid "could not parse keyserver\n"
msgstr "impossible d'analyser le serveur de clefs\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "importation des certificats commun « %s »\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "impossible de signer en utilisant « %s » : %s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr "commande incorrecte (il n'y a pas de commande implicite)\n"
@@@ -9914,120 -7901,92 +9909,120 @@@ msgstr "nom de fichier absolu attendu\n
msgid "looking up '%s'\n"
msgstr "recherche de « %s »\n"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
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:167
++#: dirmngr/dirmngr.c:170
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:168
++#: dirmngr/dirmngr.c:171
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:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr "arrêter le dirmngr"
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr "vider le cache"
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr "|FICHIER|écrire les journaux serveur dans le FICHIER"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
msgid "run without asking a user"
msgstr "exécuter sans demander à l'utilisateur"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr "forcer le chargement des listes de révocations de certificat obsolètes"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr "permettre l'envoi de requêtes OCSP"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr "interdire l'utilisation d'HTTP"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr "interdire l'utilisation de LDAP"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
"ignorer les points de distribution de liste de révocations de certificat en "
"HTTP"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
"ignorer les points de distribution de liste de révocations de certificat en "
"LDAP"
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr "ignorer les URL de service OCSP contenues dans le certificat"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|rediriger toutes les requêtes HTTP vers l'URL"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HÔTE|utiliser l'HÔTE pour les requêtes LDAP"
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "ne pas utiliser d'hôtes de repli avec --ldap-proxy"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FICHIER|lire la liste de serveurs LDAP depuis le FICHIER"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
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:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 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:216
++#: dirmngr/dirmngr.c:219
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|utiliser le répondeur OCSP à l'URL"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr "|EMPR|réponse OCSP signée par EMPR"
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
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:229
++#: dirmngr/dirmngr.c:232
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:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -10037,11 -7996,9 +10032,11 @@@ msgstr "
"(Consultez le manuel « info » pour obtenir une liste complète des commandes\n"
"et options)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Utilisation : @DIRMNGR@ [options] (-h pour l'aide)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -10050,79 -8007,62 +10045,79 @@@ msgstr "
"Serveur de clefs, liste de révocations de certificat et accès OCSP pour "
"@GNUPG@\n"
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "les niveaux de débogage possibles sont : %s\n"
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, c-format
msgid "usage: %s [options] "
msgstr "utilisation : %s [options] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
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:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, 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:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, 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:1626
++#: dirmngr/dirmngr.c:1639
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s : %u : ligne trop longue — ignorée\n"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s : %u : empreinte incorrecte détectée\n"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s : %u : erreur de lecture : %s\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, 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:1838
++#: dirmngr/dirmngr.c:1851
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:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr "SIGUSR2 reçu — aucune action définie\n"
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr "SIGTERM reçu — arrêt…\n"
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "SIGTERM reçu — encore %d connexions actives\n"
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
msgid "shutdown forced\n"
msgstr "arrêt forcé\n"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr "SIGINT reçu — arrêt immédiat\n"
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "signal %d reçu — aucune action définie\n"
@@@ -10551,76 -8400,60 +10546,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:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "échec d'assuan_inquire(%s) : %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr "ldapserver manquant"
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr "serialno manquant dans l'identifiant de certificat"
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "échec d'assuan_inquire : %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "échec de fetch_cert_by_url : %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, c-format
msgid "error sending data: %s\n"
msgstr "erreur d'envoi de données : %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "échec de start_cert_fetch : %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "échec de fetch_next_cert : %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d dépassé\n"
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "impossible d'allouer une structure de contrôle : %s\n"
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "échec d'allocation du contexte Assuan : %s\n"
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "impossible d'initialiser le serveur : %s\n"
- #: dirmngr/server.c:2632
++#: dirmngr/server.c:2738
#, 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:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "problème d'accept_assuan : %s\n"
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "problème de traitement Assuan : %s\n"
@@@ -10665,7 -8490,6 +10660,7 @@@ msgstr "
"le certificat n'aurait pas dû être utilisé pour signer une liste de "
"révocations de certificat\n"
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
msgid "quiet"
msgstr "silencieux"
@@@ -10756,281 -8560,216 +10751,281 @@@ 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr "Options contrôlant la sortie de diagnostique"
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr "Options contrôlant la configuration"
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr "Options pratiques pour le débogage"
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr "Options contrôlant la sécurité"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|oublier les clefs SSH après N secondes"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|définir la durée maximale du cache de code personnel à N secondes"
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|définir la durée maximale du cache de clef SSH à N secondes"
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr "Options d'application d'une politique de phrase secrète"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr "pas de contournement de politique de phrase secrète"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|définir la taille minimale des nouvelles phrases secrètes à N"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
"|N|nécessiter au moins N caractères non alphabétiques pour les nouvelles "
"phrases secrètes"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
"|FICHIER|vérifier la nouvelle phrase secrète par rapport aux motifs du "
"FICHIER"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
msgid "|N|expire the passphrase after N days"
msgstr "|N|la phrase secrète expire après N jours"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
msgid "do not allow the reuse of old passphrases"
msgstr "ne pas autoriser la réutilisation d'anciennes phrases secrètes"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
#, fuzzy
#| msgid "|N|set LDAP timeout to N seconds"
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|définir le temps d'expiration de LDAP à N secondes"
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOM|chiffrer aussi pour l'identité NOM"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|configurer les alias d'adresse"
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr "Configuration pour les serveurs de clefs"
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
msgid "|URL|use keyserver at URL"
msgstr "|URL|utiliser le serveur de clefs à l'URL"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr "permettre les recherches PKA (requêtes DNS)"
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
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:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr "désactiver tous les accès au dirmngr"
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
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:860
++#: tools/gpgconf-comp.c:864
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:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr "Options contrôlant le format de sortie"
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr "Options contrôlant l'interactivité et la mise en application"
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
#, fuzzy
#| msgid "Options controlling the security"
msgid "Options controlling the use of Tor"
msgstr "Options contrôlant la sécurité"
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr "Configuration pour les serveurs HTTP"
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr "utiliser la configuration de serveur mandataire (proxy) du système"
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr "Configuration des serveurs LDAP à utiliser"
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr "liste de serveurs LDAP"
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr "Configuration pour OCSP"
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
#, fuzzy
#| msgid "GPG for OpenPGP"
msgid "OpenPGP"
msgstr "GPG pour OpenPGP"
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
#, fuzzy
#| msgid "Smartcard Daemon"
msgid "Smartcards"
msgstr "Démon de carte à puce"
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
#, fuzzy
#| msgid "GPG for S/MIME"
msgid "S/MIME"
msgstr "GPG pour S/MIME"
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "erreur de réseau"
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
#| msgid "PIN and Passphrase Entry"
msgid "Passphrase Entry"
msgstr "Entrée de code personnel et de phrase secrète"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
msgid "Component not suitable for launching"
msgstr "Composant non convenable pour le lancement"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr "Échec de vérification externe du composant %s"
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr "Remarquez que les spécifications de groupe sont ignorées\n"
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, 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:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
#| msgid "error hashing '%s': %s\n"
msgid "error parsing '%s'\n"
msgstr "erreur du hachage de « %s » : %s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr "afficher tous les composants"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr "vérifier tous les programmes"
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr "|COMPOSANT|afficher les options"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr "|COMPOSANT|modifier les options"
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr "|COMPOSANT|vérifier les options"
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr "appliquer les valeurs par défaut globales"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
#, fuzzy
#| msgid "|FILE|take policy information from FILE"
msgid "|FILE|update configuration files using FILE"
msgstr "|FICHIER|prendre renseignements de politique du FICHIER"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr "aff. répertoires de configuration pour @GPGCONF@"
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
msgid "list global configuration file"
msgstr "afficher le fichier de configuration globale"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
msgid "check global configuration file"
msgstr "vérifier le fichier de configuration globale"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "mettre la base de confiance à jour"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr "recharger tous les composants ou celui donné"
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr "lancer un composant donné"
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr "tuer un composant donné"
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "utiliser comme fichier de sortie"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr "activer modif. pendant l'exécution si possible"
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Utilisation : @GPGCONF@ [options] (-h pour l'aide)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -11038,15 -8777,12 +11033,15 @@@ msgstr "
"Syntaxe : @GPGCONF@ [options]\n"
"Gérer les options de configuration pour les outils du système @GNUPG@\n"
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr "Un argument de composant nécessaire"
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
msgid "Component not found"
msgstr "Composant introuvable"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
msgid "No argument allowed"
msgstr "Aucun argument permis"
diff --cc po/gl.po
index 3cf2052,ac878c6..d41f77d
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2003-12-04 11:39+0100\n"
"Last-Translator: Jacobo Tarrio <jtarrio at trasno.net>\n"
"Language-Team: Galician <gpul-traduccion at ceu.fi.udc.es>\n"
@@@ -156,26 -127,11 +156,26 @@@ msgstr "contrasinal erróneo
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "o algoritmo de protección %d%s non está soportado\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -381,8 -298,6 +381,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "cambia-lo contrasinal"
- #: agent/gpg-agent.c:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -392,124 -307,92 +392,124 @@@ msgstr "
"Opcións:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "A chave é obsoleta"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "lareto"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ser un pouquiño máis calado"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 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:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "buscar chaves nun servidor de chaves"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualiza-la base de datos de confianza"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, 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:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
#, fuzzy
msgid "allow presetting passphrase"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "non está soportado"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -518,169 -401,121 +518,164 @@@ msgstr "non está soportado
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de resumo seleccionado non é válido\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 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:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, 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:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "non foi posible crear %s: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, fuzzy, c-format
msgid "socket name '%s' is too long\n"
msgstr "Revocación de certificado válida"
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
#, 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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: agent/gpg-agent.c:2241 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:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, 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:2327
++#: agent/gpg-agent.c:2351
#, 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:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erro lendo `%s': %s\n"
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2771
++#: agent/gpg-agent.c:2795
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "o segredo da actualización fallou: %s\n"
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu chaves omitidas\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
@@@ -696,8 -529,6 +691,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -705,9 -536,6 +700,9 @@@ msgstr "
"@Comandos:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -761,8 -581,6 +756,8 @@@ msgstr "Cancelar
msgid "error while asking for the passphrase: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "erro lendo `%s': %s\n"
@@@ -946,8 -729,6 +941,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "erro lendo `%s': %s\n"
@@@ -1427,7 -1110,6 +1422,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
#, fuzzy
msgid "out of core\n"
msgstr "non procesado"
@@@ -1486,8 -1157,6 +1481,8 @@@ msgstr "non se atopou a chave pública
msgid "waiting for lock %s...\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1673,8 -1305,6 +1668,8 @@@ msgstr "a chave secreta non está dispo
msgid "OpenPGP card no. %s detected\n"
msgstr ""
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "non se pode facer iso no modo por lotes\n"
@@@ -1689,10 -1317,6 +1684,10 @@@ msgstr "Non se admite este comando no m
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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "¿A súa selección? "
@@@ -1754,17 -1365,11 +1749,17 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "non hai unha chave pública correspondente: %s\n"
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, 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:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "erro escribindo no chaveiro `%s': %s\n"
@@@ -1821,7 -1415,6 +1816,7 @@@ msgstr "A xeración da chave fallou: %s
msgid "not an OpenPGP card"
msgstr "non se atoparon datos OpenPGP válidos.\n"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
@@@ -1857,13 -1444,10 +1852,13 @@@ msgstr "¿Qué tamaño de chave quere?
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr ""
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "redondeado a %u bits\n"
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1918,9 -1492,6 +1913,9 @@@ msgstr " (%d) RSA (só cifrar)\n
msgid " (3) Authentication key\n"
msgstr ""
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Selección non válida.\n"
@@@ -2061,22 -1602,14 +2056,22 @@@ msgstr "--output non traballa con este
msgid "can't open '%s'\n"
msgstr "non se puido abrir `%s'\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "erro ao le-lo bloque de chaves: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "non se atopou a chave `%s': %s\n"
@@@ -2173,8 -1688,6 +2168,8 @@@ msgid "
msgstr ""
"forza-la cifra simétrica %s (%d) viola as preferencias do destinatario\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, 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"
@@@ -2204,7 -1713,6 +2199,7 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%s\"\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2329,27 -1813,21 +2324,27 @@@ msgstr "%s: omitido: %s\n
msgid "writing to '%s'\n"
msgstr "escribindo a `%s'\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, 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:1904
++#: g10/export.c:1909
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "AVISO: non se exportou nada\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2360,13 -1837,10 +2355,13 @@@ msgstr "erro ao crear `%s': %s\n
msgid "[User ID not found]"
msgstr "[Non se atopou o id de usuario]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opcións de importación non válidas\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2376,61 -1849,50 +2371,61 @@@
msgid "error looking up: %s\n"
msgstr "erro lendo `%s': %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "erro ao crea-lo chaveiro `%s': %s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "erro ao crear `%s': %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "erro ao crear `%s': %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
#, fuzzy
msgid "No fingerprint"
msgstr "Pegada dactilar:"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "non se atopou a chave secreta `%s': %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOME|empregar NOME coma chave secreta por defecto"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOME|empregar NOME coma chave secreta por defecto"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, 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/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "opcións de importación non válidas\n"
@@@ -2640,7 -2056,6 +2635,7 @@@ msgstr "usar modo de texto canónico
msgid "|FILE|write output to FILE"
msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "non facer ningún cambio"
@@@ -3030,7 -2372,6 +3025,7 @@@ msgstr "%s:%d: opcións de exportació
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n"
@@@ -3049,7 -2387,6 +3044,7 @@@ msgstr "¡%s non se admite con %s!\n
msgid "%s makes no sense with %s!\n"
msgstr "¡%s non ten sentido empregándoo con %s!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr ""
@@@ -3058,7 -2394,6 +3053,7 @@@
msgid "will not run with insecure memory due to %s\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non é válido\n"
@@@ -3125,8 -2446,6 +3120,8 @@@ msgstr "preferencias de compresión per
msgid "%s does not yet work with %s\n"
msgstr "¡%s aínda non traballa con %s!\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
@@@ -3256,7 -2549,6 +3251,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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|DF|escribi-la información de estado a este DF"
@@@ -4649,7 -3667,6 +4644,7 @@@ msgstr "
"Non pode engadir unha identificación fotográfica a unha chave de estilo "
"PGP2.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr ""
@@@ -4962,54 -3918,42 +4957,54 @@@ msgstr "demasiadas preferencias `%c'\n
msgid "too many compression preferences\n"
msgstr "demasiadas preferencias `%c'\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "caracter non válido na cadea de preferencias\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "escribindo unha sinatura directa\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "escribindo a propia sinatura\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "escribindo unha sinatura que liga a chave\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tamaño de chave non válido; empregando %u bits\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tamaño de chave redondeado a %u bits\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
#, fuzzy
msgid "Sign"
msgstr "sign"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
#, fuzzy
msgid "Encrypt"
msgstr "cifrar datos"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr ""
@@@ -5023,157 -3967,126 +5018,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (só cifrar)\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Por favor, seleccione o tipo de chave que quere:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA e ElGamal (por defecto)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA e ElGamal (por defecto)\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (só asinar)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (só asinar)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (só cifrar)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (só cifrar)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (só cifrar)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (só cifrar)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA e ElGamal (por defecto)\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (só asinar)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (só cifrar)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (só cifrar)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (só cifrar)\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Notación de sinaturas: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Non hai ID de usuario con índice %d\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "redondeado a %u bits\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "¿Qué tamaño de chave quere? (1024) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "¿Qué tamaño de chave quere? (1024) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "O tamaño de chave requerido son %u bits\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Por favor, seleccione o tipo de chave que quere:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5189,7 -4102,6 +5184,7 @@@ msgstr "
" <n>m = a chave caduca en n meses\n"
" <n>y = a chave caduca en n anos\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5205,40 -4117,32 +5200,40 @@@ msgstr "
" <n>m = a sinatura caduca en n meses\n"
" <n>y = a sinatura caduca en n anos\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "¿Por canto tempo é válida a chave? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "¿Por canto tempo é válida a sinatura? (0) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "valor non válido\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s non caduca nunca\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s non caduca nunca\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s caduca o %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "A sinatura caduca o %s\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5246,12 -4150,10 +5241,12 @@@ msgstr "
"O seu sistema non pode amosar datas máis aló do 2038.\n"
"Aínda así, hase tratar correctamente ata o 2106.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "¿Isto é correcto? (s/n) "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5262,7 -4164,6 +5257,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
#, fuzzy
msgid ""
"\n"
@@@ -5279,50 -4180,39 +5274,50 @@@ msgstr "
" \"Heinrich Heime (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Nome: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Caracter non válido no nome\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "O nome non pode comezar cun díxito\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "O nome debe ter alomenos 5 caracteres\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "Enderezo de E-mail: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "Non é un enderezo de e-mail válido\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Comentario: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Carácter non válido no comentario\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Está a usa-lo xogo de caracteres `%s'.\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5333,7 -4223,6 +5328,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Por favor, non poña o enderezo de correo no nome real ou no comentario\n"
@@@ -5349,35 -4238,28 +5344,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnCcEeAaSs"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "¿Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)aír? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "¿Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)aír? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "¿Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)aír? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "¿Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)aír? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Por favor, corrixa antes o erro\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
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"
@@@ -5389,13 -4271,10 +5384,13 @@@ msgstr "
"mentres se xeran os números primos; isto proporciónalle ao xerador de\n"
"números aleatorios unha opoertunidade de acumular entropía de abondo.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A xeración da chave fallou: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5403,68 -4282,55 +5398,68 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' xa está comprimido\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "¿Crear de tódolos xeitos? "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "¿Crear de tódolos xeitos? "
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Cancelouse a xeración de chaves.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "non se pode crear `%s': %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "gravando a chave pública en `%s'\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "non se atopou un chaveiro público no que se poida escribir: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "erro escribindo no chaveiro público `%s': %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
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:4837
++#: g10/keygen.c:4859
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5474,7 -4340,6 +5469,7 @@@ msgstr "
"queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
"con esa finalidade.\n"
- #: g10/keygen.c:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5482,7 -4347,6 +5477,7 @@@ msgstr "
"creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
"reloxo)\n"
- #: g10/keygen.c:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5490,22 -4354,18 +5485,22 @@@ msgstr "
"creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
"reloxo)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
#, 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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
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:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
#, 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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
#, fuzzy
msgid "Really create? (y/N) "
msgstr "¿Crear realmente? "
@@@ -6252,23 -4966,18 +6247,23 @@@ msgstr "¿É esta foto correcta (s/N/q)
msgid "unable to display photo ID!\n"
msgstr "¡non se pode amosa-la identificación fotográfica!\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Non se especificou un motivo"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "A chave é obsoleta"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "Esta chave quedou descoberta"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "Xa non se emprega esta chave"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "O ID de usuario xa non é válido"
@@@ -6349,7 -5045,6 +6344,7 @@@ msgid "
"\n"
msgstr ""
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "¿A súa decisión? "
@@@ -6503,46 -5170,37 +6498,46 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Non é seguro que a sinatura pertenza ao seu propietario.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: omitido: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: omitido: a chave pública está desactivada\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: omitido: a chave pública xa está presente\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "non se puido conectar a `%s': %s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "algoritmo de hash non válido `%s'\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "algoritmo de hash non válido `%s'\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Non especificou un ID de usuario. (pode empregar \"-r\")\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6550,38 -5208,30 +6545,38 @@@ msgstr "
"\n"
"Introduza o ID de usuario. Remate cunha liña en branco: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Non hai tal ID de usuario.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr ""
"omitido: a chave pública xa está estabrecida coma destinatario por defecto\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "A chave pública está desactivada.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "omitido: chave pública xa estabrecida\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatario por defecto `%s' descoñecido\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "non hai enderezos válidos\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "chave %08lX: non hai ID de usuario\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "chave %08lX: non hai ID de usuario\n"
@@@ -6686,7 -5314,6 +6681,7 @@@ msgstr "A chave secreta está disponibl
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "¿Crear un certificado de revocación para esta sinatura? "
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "Forzouse unha saída con armadura ASCII.\n"
@@@ -6704,19 -5328,16 +6699,19 @@@ msgstr "Creouse o certificado de revoca
msgid "no revocation keys found for \"%s\"\n"
msgstr "non se atoparon chaves de revocación para `%s'\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "¿Crear un certificado de revocación para esta sinatura? "
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6725,20 -5346,17 +6720,20 @@@
"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:577
++#: g10/revoke.c:590
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Creouse o certificado de revocación.\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "non se atopou a chave secreta `%s': %s\n"
@@@ -6746,23 -5364,19 +6741,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "erro ao crea-lo chaveiro `%s': %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "¿Crear un certificado de revocación para esta sinatura? "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6780,33 -5394,26 +6775,33 @@@ msgstr "
"se volve ilexible. Pero teña coidado: o sistema de impresión da súa\n"
"máquina podería armacena-los datos e deixárllelos dispoñibles a outros.\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Por favor, escolla o motivo da revocación:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Cancelar"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(probablemente queira seleccionar %d aquí)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Introduza unha descrición opcional; remátea cunha liña en branco:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Motivo para a revocación: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(Non se deu unha descrición)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "¿É correcto? "
@@@ -7216,10 -5749,6 +7211,10 @@@ msgstr "erro ao crea-lo contrasinal: %s
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
@@@ -7251,7 -5775,6 +7246,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "erro lendo `%s': %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
@@@ -7563,18 -6037,14 +7558,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7639,7 -6097,6 +7634,7 @@@ msgstr "
msgid "no need for a trustdb check\n"
msgstr "non se precisa comproba-la base de datos de confianza\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "hase comproba-la base de datos de confianza o %s\n"
@@@ -7667,14 -6119,12 +7662,14 @@@ msgstr "por favor, execute con --check-
msgid "checking the trustdb\n"
msgstr "comprobando a base de datos de confianza\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "%lu chaves procesadas hasta polo momento\n"
msgstr[1] "%lu chaves procesadas hasta polo momento\n"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7682,22 -6132,18 +7677,22 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "procesáronse %d chaves (marcáronse %d contas de validez)\n"
msgstr[1] "procesáronse %d chaves (marcáronse %d contas de validez)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "non se atoparon chaves de confianza absoluta\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "non se atopou a chave pública da clave de confianza absoluta %08lX\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
@@@ -8130,76 -6490,60 +8125,76 @@@ msgstr "cambia-lo contrasinal
msgid "|N|Initial New PIN"
msgstr "Introduza o ID de usuario: "
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr ""
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
#, fuzzy
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
#, fuzzy
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
#, fuzzy
msgid "do not use the internal CCID driver"
msgstr "non usa-la terminal en absoluto"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr ""
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr ""
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
#, fuzzy
msgid "deny the use of admin card commands"
msgstr "comandos conflictivos\n"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8930,7 -7121,6 +8925,7 @@@ msgstr "engadir este chaveiro á lista
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOME|empregar NOME coma chave secreta por defecto"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
@@@ -8990,17 -7170,14 +8985,17 @@@ msgstr " o = omitir esta chave\n
msgid "could not parse keyserver\n"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "escribindo a `%s'\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "non se pode pechar `%s': %s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9957,116 -7944,88 +9952,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
#, fuzzy
msgid "run without asking a user"
msgstr "¿Saír sin gardar? "
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10079,91 -8038,72 +10074,91 @@@ msgstr "
"@\n"
"(Vexa a páxina man para un listado completo de comandos e opcións)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uso: gpg [opcións] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
#, 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:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "non se puido poñe-la armadura: %s\n"
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "non se puido poñe-la armadura: %s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "liña longa de máis\n"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "erro: pegada dactilar non válida\n"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "erro de lectura: %s\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
#, fuzzy
msgid "shutdown forced\n"
msgstr "non procesado"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10607,77 -8456,61 +10602,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "fallou a sinatura: %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "fallou a sinatura: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "non se pode crear `%s': %s\n"
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, 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:2624
++#: dirmngr/server.c:2730
#, 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:2632
++#: dirmngr/server.c:2738
#, 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:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10721,7 -8546,6 +10716,7 @@@ msgstr "Revocación de certificado vál
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
#, fuzzy
msgid "quiet"
msgstr "abandonar"
@@@ -10814,287 -8618,219 +10809,287 @@@ 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr ""
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr ""
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
#, fuzzy
msgid "Options useful for debugging"
msgstr "habilitar depuración total"
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|emprega-lo modo de contrasinal N"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|empregar NOME coma chave secreta por defecto"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOME|cifrar para NOME"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
#, 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:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "erro de rede"
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
msgid "Passphrase Entry"
msgstr "contrasinal erróneo"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
#, fuzzy
msgid "Component not suitable for launching"
msgstr "non se atopou a chave pública"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "erro lendo `%s': %s\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "erro lendo `%s': %s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
#, fuzzy
msgid "list global configuration file"
msgstr " creouse un novo ficheiro de configuración `%s'\n"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
#, fuzzy
msgid "check global configuration file"
msgstr " creouse un novo ficheiro de configuración `%s'\n"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "actualiza-la base de datos de confianza"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "usar coma ficheiro de saída"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
#, fuzzy
msgid "Component not found"
msgstr "non se atopou a chave pública"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
#, fuzzy
msgid "No argument allowed"
msgstr "gravando a chave secreta en `%s'\n"
diff --cc po/gnupg2.pot
index e2b8d93,eea3fd7..b415305
--- a/po/gnupg2.pot
+++ b/po/gnupg2.pot
@@@ -1,27 -1,30 +1,27 @@@
-# Norwegian (bokmål) translation of Gnu Privacy Guard.
-# Copyright (C) 1998-2017 Free Software Foundation, Inc.
-# This file is distributed under the same license as the GnuPG package.
-# Trond Endrestøl <Trond.Endrestol at fagskolen.gjovik.no>, 2004.
-# Åka Sikrom <a4 at hush.com>, 2016-2017.
-#
-# Send this file to:
-# translations at gnupg.org
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
+#, fuzzy
msgid ""
msgstr ""
- "Project-Id-Version: GNU gnupg 2.2.3\n"
-"Project-Id-Version: GNU gnupg 2.1\n"
++"Project-Id-Version: GNU gnupg 2.2.4\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-11-20 12:04+0100\n"
-"PO-Revision-Date: 2017-11-02 17:40+0100\n"
-"Last-Translator: Åka Sikrom <a4 at hush.com>\n"
-"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
-"Language: nb\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-06-15 11:29+0000\n"
-"X-Generator: Poedit 1.8.7.1\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+#: agent/call-pinentry.c:305
#, c-format
msgid "failed to acquire the pinentry lock: %s\n"
-msgstr "klarte ikke å skaffe pin-inntastingslås: %s\n"
+msgstr ""
#. TRANSLATORS: These are labels for buttons etc used in
#. Pinentries. An underscore indicates that the next letter
@@@ -110,94 -100,63 +110,94 @@@ 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:1085
#, c-format
msgid "SETERROR %s (try %d of %d)"
-msgstr "SETERROR %s (forsøk %d av %d)"
+msgstr ""
+#: agent/call-pinentry.c:1096
msgid "Repeat:"
-msgstr "Gjenta:"
+msgstr ""
+#: agent/call-pinentry.c:1125 agent/call-pinentry.c:1137
msgid "PIN too long"
-msgstr "For lang PIN"
+msgstr ""
+#: agent/call-pinentry.c:1126
msgid "Passphrase too long"
-msgstr "For lang passordfrase"
+msgstr ""
+#: agent/call-pinentry.c:1134
msgid "Invalid characters in PIN"
-msgstr "Ugyldig tegn i PIN"
+msgstr ""
+#: agent/call-pinentry.c:1139
msgid "PIN too short"
-msgstr "Koden er for kort"
+msgstr ""
+#: agent/call-pinentry.c:1152
msgid "Bad PIN"
-msgstr "Ugyldig PIN"
+msgstr ""
+#: agent/call-pinentry.c:1152
msgid "Bad Passphrase"
-msgstr "Ugyldig passordfrase"
+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 "ssh-nøkler som er lenger enn %d bit støttes ikke\n"
+msgstr ""
+#: 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:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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"
+msgstr ""
+#: 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:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, c-format
msgid "can't open '%s': %s\n"
-msgstr "klarte ikke å åpne «%s»: %s\n"
+msgstr ""
+#: 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"
+msgstr ""
+#: agent/command-ssh.c:2462
#, c-format
msgid "detected card with S/N: %s\n"
-msgstr "oppdaget kort med serienummer %s\n"
+msgstr ""
+#: 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"
+msgstr ""
+#: agent/command-ssh.c:2487
#, c-format
msgid "no suitable card key found: %s\n"
-msgstr "fant ingen passende kortnøkkel: %s\n"
+msgstr ""
+#: agent/command-ssh.c:2614
#, c-format
msgid "error getting list of cards: %s\n"
-msgstr "feil under henting av kortliste: %s\n"
+msgstr ""
+#: agent/command-ssh.c:2788
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -336,322 -274,237 +336,317 @@@ 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] "Passordfraser bør inneholde minst %u siffer eller%%0Aspesialtegn."
-msgstr[1] "Passordfraser bør inneholde minst %u sifre eller%%0Aspesialtegn."
+msgstr[0] ""
+msgstr[1] ""
+#: agent/genkey.c:278
#, c-format
msgid "A passphrase may not be a known term or match%%0Acertain pattern."
-msgstr "Ikke bruk kjente ord, uttrykk eller kjente mønster%%0Ai passordfraser."
+msgstr ""
+#: agent/genkey.c:293
msgid "Warning: You have entered an insecure passphrase."
-msgstr "Advarsel: du har skrevet inn en svak passordfrase."
+msgstr ""
+#: agent/genkey.c:480
#, c-format
msgid "Please enter the passphrase to%0Aprotect your new key"
-msgstr "Skriv inn passordfrase for å%0Abeskytte ny nøkkel"
+msgstr ""
+#: agent/genkey.c:606
msgid "Please enter the new passphrase"
-msgstr "Skriv inn ny passordfrase"
+msgstr ""
- #: agent/gpg-agent.c:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
msgstr ""
-"@Valg:\n"
-" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
-msgstr "kjør som bakgrunnsprosess («daemon»)"
+msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
-msgstr "kjør i tjenermodus (forgrunn)"
+msgstr ""
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
msgid "run in supervised mode"
-msgstr "kjør i «supervised» modus"
+msgstr ""
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
-msgstr "detaljert utskrift"
+msgstr ""
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
-msgstr "være noenlunde stille"
+msgstr ""
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
-msgstr "sh-utdata for kommandoer"
+msgstr ""
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
-msgstr "csh-utdata for kommandoer"
+msgstr ""
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
-msgstr "|FIL|les valg fra valgt FIL"
+msgstr ""
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
-msgstr "ikke løsne fra konsoll"
+msgstr ""
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
msgid "use a log file for the server"
-msgstr "bruk loggfil for tjeneren"
+msgstr ""
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PGM|bruk PGM til inntasting av PIN-koder"
+msgstr ""
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PGM|bruk PGN som SCdaemon-program"
+msgstr ""
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
msgid "do not use the SCdaemon"
-msgstr "ikke bruk SCdaemon"
+msgstr ""
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
msgid "|NAME|accept some commands via NAME"
-msgstr "|NAME|godta enkelte kommandoer via «NAME»"
+msgstr ""
- #: agent/gpg-agent.c:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
-msgstr "ignorer forespørsler om å bytte TTY"
+msgstr ""
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
-msgstr "ignorer forespørsler om å bytte X-skjerm"
+msgstr ""
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
-msgstr "|N|fjern hurtiglagrede PIN-koder etter N sekunder"
+msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
-msgstr "ikke bruk PIN-hurtiglager under signering"
+msgstr ""
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
msgid "disallow the use of an external password cache"
-msgstr "ikke tillat bruk av eksternt passord-hurtiglager"
+msgstr ""
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
-msgstr "ikke la klienter tillitsmarkere nøkler"
+msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
msgid "allow presetting passphrase"
-msgstr "tillat valg av passordfrase på forhånd"
+msgstr ""
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
-msgstr "ikke la kaller overstyre PIN-inntasting"
+msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
-msgstr "la brukeren skrive inn passordfrase via Emacs"
+msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
msgid "enable ssh support"
-msgstr "slå på ssh-støtte"
+msgstr ""
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
-msgstr "|ALGO|bruk valgt ALGOritme til å vise ssh-fingeravtrykk"
+msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
msgid "enable putty support"
-msgstr "slå på støtte for 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:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
-msgstr "Rapporter programfeil til <@EMAIL@>.\n"
+msgstr ""
- #: agent/gpg-agent.c:513
++#: agent/gpg-agent.c:523
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
-msgstr "Bruk: @GPG_AGENT@ [valg] («-h» for hjelp)"
+msgstr ""
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
-"Syntaks: @GPG_AGENT@ [valg] [kommando [arg]]\n"
-"Håndtering av hemmelige nøkler for @GNUPG@\n"
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
-msgstr "«%s» er et ugyldig feilsøkingsnivå\n"
+msgstr ""
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
-msgstr "valg kontrollsum-algoritme er ugyldig\n"
+msgstr ""
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, c-format
msgid "Note: no default option file '%s'\n"
-msgstr "Merk: standardvalg-fil «%s» finnes ikke\n"
+msgstr ""
- #: agent/gpg-agent.c:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
-msgstr "valgfil «%s»: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, c-format
msgid "reading options from '%s'\n"
-msgstr "leser valg fra «%s»\n"
+msgstr ""
- #: agent/gpg-agent.c:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, c-format
msgid "Note: '%s' is not considered an option\n"
-msgstr "Merk: «%s» regnes ikke som et valg\n"
+msgstr ""
- #: agent/gpg-agent.c:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, c-format
msgid "can't create socket: %s\n"
-msgstr "klarte ikke å lage sokkel: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, c-format
msgid "socket name '%s' is too long\n"
-msgstr "sokkelnavnet «%s» er for langt\n"
+msgstr ""
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
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"
+msgstr ""
- #: agent/gpg-agent.c:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
msgid "error getting nonce for the socket\n"
-msgstr "feil under henting av sokkel-anledning\n"
+msgstr ""
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, c-format
msgid "error binding socket to '%s': %s\n"
-msgstr "feil under knytning av sokkel til «%s»: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, c-format
msgid "can't set permissions of '%s': %s\n"
-msgstr "klarte ikke å endre tillatelser til «%s»: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:2241 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
- #, c-format
- msgid "listen() failed: %s\n"
- msgstr ""
-
- #: agent/gpg-agent.c:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, c-format
msgid "listening on socket '%s'\n"
-msgstr "lytter på sokkel «%s»\n"
+msgstr ""
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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"
+msgstr ""
- #: agent/gpg-agent.c:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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"
+msgstr ""
- #: agent/gpg-agent.c:2323
++#: agent/gpg-agent.c:2347
#, c-format
msgid "stat() failed for '%s': %s\n"
-msgstr "stat() mislyktes for «%s»: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:2327
++#: agent/gpg-agent.c:2351
#, c-format
msgid "can't use '%s' as home directory\n"
-msgstr "«%s» kan ikke brukes som hjemmemappe\n"
+msgstr ""
- #: agent/gpg-agent.c:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, c-format
msgid "error reading nonce on fd %d: %s\n"
-msgstr "feil under lesing av anledning på fd %d: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
-msgstr "startet behandler 0x%lx for fd %d\n"
+msgstr ""
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
-msgstr "avsluttet behandler 0x%lx for fd %d\n"
+msgstr ""
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
-msgstr "startet ssh-behandler 0x%lx for fd %d\n"
+msgstr ""
- #: agent/gpg-agent.c:2771
++#: agent/gpg-agent.c:2795
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
-msgstr "avsluttet ssh-behandler 0x%lx for fd %d\n"
+msgstr ""
- #: agent/gpg-agent.c:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
-msgstr "npth_pselect mislyktes: %s - venter 1s\n"
+msgstr ""
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, c-format
msgid "%s %s stopped\n"
-msgstr "%s %s stoppet\n"
+msgstr ""
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
+msgstr ""
+#: 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"
+msgstr ""
+#: agent/preset-passphrase.c:103
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
msgstr ""
-"Syntaks: gpg-preset-passphrase [valg] KEYGRIP\n"
-"Vedlikehold av hurtiglager for passord\n"
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
msgstr ""
-"@Kommandoer:\n"
-" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -687,55 -540,46 +682,55 @@@ msgid "
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr ""
-"Skriv inn passordfrase eller PIN-kode som\n"
-"kreves for å fullføre gjeldende handling."
+#: agent/protect-tool.c:720 tools/symcryptrun.c:462
msgid "cancelled\n"
-msgstr "avbrutt\n"
+msgstr ""
+#: agent/protect-tool.c:722 tools/symcryptrun.c:458
#, c-format
msgid "error while asking for the passphrase: %s\n"
-msgstr "feil under spørring etter passordfrase: %s\n"
+msgstr ""
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, c-format
msgid "error opening '%s': %s\n"
-msgstr "feil under åpning av «%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 "fil «%s», linje %d: %s\n"
+msgstr ""
+#: agent/trustlist.c:192 agent/trustlist.c:200
#, c-format
msgid "statement \"%s\" ignored in '%s', line %d\n"
-msgstr "uttrykk «%s» ignorert i «%s», linje %d\n"
+msgstr ""
+#: agent/trustlist.c:206
#, c-format
msgid "system trustlist '%s' not available\n"
-msgstr "system-tillitsliste «%s» er ikke tilgjengelig\n"
+msgstr ""
+#: agent/trustlist.c:250
#, c-format
msgid "bad fingerprint in '%s', line %d\n"
-msgstr "ugyldig fingeravtrykk i «%s», linje %d\n"
+msgstr ""
+#: agent/trustlist.c:275 agent/trustlist.c:282
#, c-format
msgid "invalid keyflag in '%s', line %d\n"
-msgstr "ugyldig nøkkelvalg i «%s», linje %d\n"
+msgstr ""
+#: agent/trustlist.c:316 common/helpfile.c:136
#, c-format
msgid "error reading '%s', line %d: %s\n"
-msgstr "feil under lesing av «%s», linje %d: %s\n"
+msgstr ""
+#: agent/trustlist.c:434 agent/trustlist.c:503
msgid "error reading list of trusted root certificates\n"
-msgstr "feil under lesing av liste over tillitsmerkede rotsertifikater\n"
+msgstr ""
#. TRANSLATORS: This prompt is shown by the Pinentry
#. and has one special property: A "%%0A" is used by
@@@ -823,71 -659,56 +818,71 @@@ msgid "
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
-"Advarsel: denne nøkkelen brukes også som SSH-nøkkel.\n"
-"Hvis du sletter nøkkelen, kan du miste tilgang til én eller flere eksterne "
-"maskiner."
+#: 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 krever at kontrollsummen er multipliserbar med 8 bit\n"
+msgstr ""
+#: agent/pksign.c:187 sm/certcheck.c:97
#, c-format
msgid "%s key uses an unsafe (%u bit) hash\n"
-msgstr "%s nøkkel bruker utrygg kontrollsum (%u bit)\n"
+msgstr ""
+#: agent/pksign.c:202
#, c-format
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"
+msgstr ""
+#: agent/pksign.c:523
#, c-format
msgid "checking created signature failed: %s\n"
-msgstr "kontroll av opprettet signatur mislyktes: %s\n"
+msgstr ""
+#: agent/cvt-openpgp.c:338
msgid "secret key parts are not available\n"
-msgstr "hemmelige nøkkeldeler er ikke tilgjenglig\n"
+msgstr ""
+#: agent/cvt-openpgp.c:344
#, c-format
msgid "public key algorithm %d (%s) is not supported\n"
-msgstr "offentlig nøkkelalgoritme %d (%s) støttes ikke\n"
+msgstr ""
+#: agent/cvt-openpgp.c:448
#, c-format
msgid "protection algorithm %d (%s) is not supported\n"
-msgstr "beskyttelsesalgoritme %d (%s) støttes ikke\n"
+msgstr ""
+#: agent/cvt-openpgp.c:455
#, c-format
msgid "protection hash algorithm %d (%s) is not supported\n"
-msgstr "kontrollsum-algoritme for beskyttelse %d (%s) støttes ikke\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 "feil under opprettelse av datarør: %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 "feil under opprettelse av strøm for datarør: %s\n"
+msgstr ""
+#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, c-format
msgid "error forking process: %s\n"
-msgstr "feil under kopiering av prosess: %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 "prosess %d avsluttet ikke i tide: %s\n"
+msgstr ""
+#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr ""
@@@ -1056,400 -843,307 +1051,400 @@@ 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|Bra"
+msgstr ""
+#: common/audit.c:477
msgid "|audit-log-result|Bad"
-msgstr "|audit-log-result|Dårlig"
+msgstr ""
+#: common/audit.c:479
msgid "|audit-log-result|Not supported"
-msgstr "|audit-log-result|Støttes ikke"
+msgstr ""
+#: common/audit.c:481
msgid "|audit-log-result|No certificate"
-msgstr "|audit-log-result|Ingen sertifikat"
+msgstr ""
+#: common/audit.c:483
msgid "|audit-log-result|Not enabled"
-msgstr "|audit-log-result|Ikke i bruk"
+msgstr ""
+#: common/audit.c:485
msgid "|audit-log-result|Error"
-msgstr "|audit-log-result|Feil"
+msgstr ""
+#: common/audit.c:487
msgid "|audit-log-result|Not used"
-msgstr "|audit-log-result|Ikke brukt"
+msgstr ""
+#: common/audit.c:489
msgid "|audit-log-result|Okay"
-msgstr "|audit-log-result|Ok"
+msgstr ""
+#: common/audit.c:491
msgid "|audit-log-result|Skipped"
-msgstr "|audit-log-result|Hoppet over"
+msgstr ""
+#: common/audit.c:493
msgid "|audit-log-result|Some"
-msgstr "|audit-log-result|Noe"
+msgstr ""
+#: common/audit.c:726
msgid "Certificate chain available"
-msgstr "Sertifikatkjede tilgjengelig"
+msgstr ""
+#: common/audit.c:733
msgid "root certificate missing"
-msgstr "rotsertifikat mangler"
+msgstr ""
+#: common/audit.c:759
msgid "Data encryption succeeded"
-msgstr "Datakryptering fullført"
+msgstr ""
+#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
msgid "Data available"
-msgstr "Data tilgjengelig"
+msgstr ""
+#: common/audit.c:767
msgid "Session key created"
-msgstr "Øktnøkkel opprettet"
+msgstr ""
+#: common/audit.c:772 common/audit.c:912 common/audit.c:919
#, c-format
msgid "algorithm: %s"
-msgstr "algoritme: %s"
+msgstr ""
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
+#: scd/app-openpgp.c:3273
#, c-format
msgid "unsupported algorithm: %s"
-msgstr "ustøttet algoritme: %s"
+msgstr ""
+#: common/audit.c:778 common/audit.c:925
msgid "seems to be not encrypted"
-msgstr "ser ikke ut til å være kryptert"
+msgstr ""
+#: common/audit.c:784 common/audit.c:933
msgid "Number of recipients"
-msgstr "Antall mottakere"
+msgstr ""
+#: common/audit.c:792 common/audit.c:956
#, c-format
msgid "Recipient %d"
-msgstr "Mottaker %d"
+msgstr ""
+#: common/audit.c:825
msgid "Data signing succeeded"
-msgstr "Datasignering fullført"
+msgstr ""
+#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
#, c-format
msgid "data hash algorithm: %s"
-msgstr "summeringsalgoritme for data: %s"
+msgstr ""
+#: common/audit.c:862
#, c-format
msgid "Signer %d"
-msgstr "Undertegnet %d"
+msgstr ""
+#: common/audit.c:866 common/audit.c:1065
#, c-format
msgid "attr hash algorithm: %s"
-msgstr "summeringsalgoritme for attributter: %s"
+msgstr ""
+#: common/audit.c:901
msgid "Data decryption succeeded"
-msgstr "Datadekryptering fullført"
+msgstr ""
+#: common/audit.c:910
msgid "Encryption algorithm supported"
-msgstr "Krypteringsalgoritme støttes"
+msgstr ""
+#: common/audit.c:993
msgid "Data verification succeeded"
-msgstr "Databekreftelse vellykket"
+msgstr ""
+#: common/audit.c:1002
msgid "Signature available"
-msgstr "Signatur tilgjengelig"
+msgstr ""
+#: common/audit.c:1024
msgid "Parsing data succeeded"
-msgstr "Datatolkning fullført"
+msgstr ""
+#: common/audit.c:1036
#, c-format
msgid "bad data hash algorithm: %s"
-msgstr "ugyldig summeringsalgoritme for data: %s"
+msgstr ""
+#: common/audit.c:1051
#, c-format
msgid "Signature %d"
-msgstr "Signatur %d"
+msgstr ""
+#: common/audit.c:1079
msgid "Certificate chain valid"
-msgstr "Sertifikatkjede gyldig"
+msgstr ""
+#: common/audit.c:1090
msgid "Root certificate trustworthy"
-msgstr "Rotsertifikat regnes som troverdig"
+msgstr ""
+#: common/audit.c:1111 sm/certchain.c:1009
msgid "no CRL found for certificate"
-msgstr "fant ingen sertifikat-CRL"
+msgstr ""
+#: common/audit.c:1114 sm/certchain.c:1019
msgid "the available CRL is too old"
-msgstr "tilgjengelig CRL er for gammel"
+msgstr ""
+#: common/audit.c:1119
msgid "CRL/OCSP check of certificates"
-msgstr "CRL-/OCSP-sertifikatkontroll"
+msgstr ""
+#: common/audit.c:1139
msgid "Included certificates"
-msgstr "Inkluderte sertifikater"
+msgstr ""
+#: common/audit.c:1194
msgid "No audit log entries."
-msgstr "Ingen elementer i revisjonslogg."
+msgstr ""
+#: common/audit.c:1243
msgid "Unknown operation"
-msgstr "Ukjent handling"
+msgstr ""
+#: common/audit.c:1261
msgid "Gpg-Agent usable"
-msgstr "Gpg-Agent kan brukes"
+msgstr ""
+#: common/audit.c:1271
msgid "Dirmngr usable"
-msgstr "Dirmngr kan brukes"
+msgstr ""
+#: common/audit.c:1307
#, c-format
msgid "No help available for '%s'."
-msgstr "Ingen hjelp tilgjengelig for «%s»"
+msgstr ""
+#: common/helpfile.c:90
msgid "ignoring garbage line"
-msgstr "ignorerer ubrukelig linje"
+msgstr ""
+#: common/gettime.c:890
msgid "[none]"
-msgstr "[ingen]"
+msgstr ""
+#: common/ksba-io-support.c:338
#, c-format
msgid "invalid radix64 character %02x skipped\n"
-msgstr "hoppet over ugyldig radix64-tegn %02x\n"
+msgstr ""
+#: common/argparse.c:365
msgid "argument not expected"
-msgstr "uforventet argument"
+msgstr ""
+#: common/argparse.c:367
msgid "read error"
-msgstr "lesefeil"
+msgstr ""
+#: common/argparse.c:369
msgid "keyword too long"
-msgstr "nøkkelord er for langt"
+msgstr ""
+#: common/argparse.c:371
msgid "missing argument"
-msgstr "argument mangler"
+msgstr ""
+#: common/argparse.c:373
msgid "invalid argument"
-msgstr "ugydig argument"
+msgstr ""
+#: common/argparse.c:375
msgid "invalid command"
-msgstr "ugyldig kommando"
+msgstr ""
+#: common/argparse.c:377
msgid "invalid alias definition"
-msgstr "ugyldig aliasdefinisjon"
+msgstr ""
+#: common/argparse.c:379
msgid "out of core"
-msgstr "kjernen er full"
+msgstr ""
+#: common/argparse.c:381
msgid "invalid option"
-msgstr "ugyldig valg"
+msgstr ""
+#: common/argparse.c:389
#, c-format
msgid "missing argument for option \"%.50s\"\n"
-msgstr "valget «%.50s» mangler et argument\n"
+msgstr ""
+#: common/argparse.c:391 g10/gpg.c:3494
#, c-format
msgid "invalid argument for option \"%.50s\"\n"
-msgstr "ugyldig argument for valget «%.50s»\n"
+msgstr ""
+#: common/argparse.c:393
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
-msgstr "valget «%.50s» skal ikke brukes med argumenter\n"
+msgstr ""
+#: common/argparse.c:395
#, c-format
msgid "invalid command \"%.50s\"\n"
-msgstr "kommandoen «%.50s» er ugyldig\n"
+msgstr ""
+#: common/argparse.c:397
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
-msgstr "valget «%.50s» er flertydig\n"
+msgstr ""
+#: common/argparse.c:399
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
-msgstr "kommandoen «%.50s» er flertydig\n"
+msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
msgid "out of core\n"
-msgstr "kjernen er full\n"
+msgstr ""
+#: common/argparse.c:403
#, c-format
msgid "invalid option \"%.50s\"\n"
-msgstr "valget «%.50s» er ugyldig\n"
+msgstr ""
+#: common/utf8conv.c:123
#, c-format
msgid "conversion from '%s' to '%s' not available\n"
-msgstr "konvertering fra «%s» til «%s» er ikke tilgjengelig\n"
+msgstr ""
+#: common/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
-msgstr "iconv_open mislyktes: %s\n"
+msgstr ""
+#: common/utf8conv.c:385 common/utf8conv.c:651
#, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
-msgstr "konvertering fra «%s» til «%s» mislyktes: %s\n"
+msgstr ""
+#: common/dotlock.c:707
#, c-format
msgid "failed to create temporary file '%s': %s\n"
-msgstr "klarte ikke å lage midlertidig fil «%s»: %s\n"
+msgstr ""
+#: common/dotlock.c:771
#, c-format
msgid "error writing to '%s': %s\n"
-msgstr "feil under skriving til «%s»: %s\n"
+msgstr ""
+#: common/dotlock.c:1116
#, c-format
msgid "removing stale lockfile (created by %d)\n"
-msgstr "fjerner ødelagt låsfil (laget av %d)\n"
+msgstr ""
+#: common/dotlock.c:1152
#, c-format
msgid "waiting for lock (held by %d%s) %s...\n"
-msgstr "venter på lås (holdt igjen av %d%s) %s …\n"
+msgstr ""
+#: common/dotlock.c:1153
msgid "(deadlock?) "
-msgstr "(vranglås?) "
+msgstr ""
+#: common/dotlock.c:1192
#, c-format
msgid "lock '%s' not made: %s\n"
-msgstr "lås «%s» ikke opprettet: %s\n"
+msgstr ""
+#: common/dotlock.c:1219
#, c-format
msgid "waiting for lock %s...\n"
-msgstr "venter på lås %s …\n"
+msgstr ""
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
-msgstr "%s er for gammel (krever %s, har %s)\n"
+msgstr ""
+#: g10/armor.c:423
#, c-format
msgid "armor: %s\n"
-msgstr "armor: %s\n"
+msgstr ""
+#: g10/armor.c:462
msgid "invalid armor header: "
-msgstr "ugyldig armorheader: "
+msgstr ""
+#: g10/armor.c:473
msgid "armor header: "
-msgstr "armorheader: "
+msgstr ""
+#: g10/armor.c:486
msgid "invalid clearsig header\n"
-msgstr "ugyldig clearsigheader\n"
+msgstr ""
+#: g10/armor.c:499
msgid "unknown armor header: "
-msgstr "ukjent skjold-hode: "
+msgstr ""
+#: g10/armor.c:552
msgid "nested clear text signatures\n"
-msgstr "nøstede klartekst-signaturer\n"
+msgstr ""
+#: g10/armor.c:687
msgid "unexpected armor: "
-msgstr "uforventet armering: "
+msgstr ""
+#: g10/armor.c:700
msgid "invalid dash escaped line: "
-msgstr "ugyldig bindestrekbeskyttet linje: "
+msgstr ""
+#: g10/armor.c:872 g10/armor.c:1492
#, c-format
msgid "invalid radix64 character %02X skipped\n"
-msgstr "hoppet over ugyldig radix64-tegn %02x\n"
+msgstr ""
+#: g10/armor.c:915
msgid "premature eof (no CRC)\n"
-msgstr "for tidlig eof (ingen CRC)\n"
+msgstr ""
+#: g10/armor.c:949
msgid "premature eof (in CRC)\n"
-msgstr "for tidlig eof (i CRC)\n"
+msgstr ""
+#: g10/armor.c:957
msgid "malformed CRC\n"
-msgstr "feilformatert CRC\n"
+msgstr ""
+#: g10/armor.c:961 g10/armor.c:1529
#, c-format
msgid "CRC error; %06lX - %06lX\n"
-msgstr "CRC-feil; %06lX - %06lX\n"
+msgstr ""
+#: g10/armor.c:981
msgid "premature eof (in trailer)\n"
-msgstr "for tidlig eof (på sluttlinje)\n"
+msgstr ""
+#: g10/armor.c:985
msgid "error in trailer line\n"
-msgstr "feil på etterfølgende linje\n"
+msgstr ""
+#: g10/armor.c:1305
msgid "no valid OpenPGP data found.\n"
-msgstr "fant ingen gyldig OpenPGP-data.\n"
+msgstr ""
+#: g10/armor.c:1310
#, c-format
msgid "invalid armor: line longer than %d characters\n"
-msgstr "ugyldig armor: linje lengre enn %d tegn\n"
+msgstr ""
+#: g10/armor.c:1314
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@@ -1464,579 -1158,449 +1459,579 @@@ msgid "
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr ""
-"notatnavn kan bare inneholde utskrivbare tegn og mellomrom, og må slutte med "
-"«=»\n"
+#: g10/build-packet.c:1274 g10/build-packet.c:1370
msgid "a user notation name must contain the '@' character\n"
-msgstr "bruker-notatnavn må inneholde tegnet «@»\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 "notatnavn kan ikke inneholde flere enn ett «@»-tegn\n"
+msgstr ""
+#: g10/build-packet.c:1298
msgid "a notation value must not use any control characters\n"
-msgstr "notatverdier kan ikke inneholde kontrolltegn\n"
+msgstr ""
+#: g10/build-packet.c:1354
msgid "a notation name may not contain an '=' character\n"
-msgstr "notatnavn kan ikke inneholde tegnet «=»\n"
+msgstr ""
+#: g10/build-packet.c:1360
msgid "a notation name must have only printable characters or spaces\n"
-msgstr "notatnavn skal bare inneholde utskrivbare tegn og evt. mellomrom\n"
+msgstr ""
+#: g10/build-packet.c:1419 g10/build-packet.c:1430
msgid "WARNING: invalid notation data found\n"
-msgstr "ADVARSEL: fant ugyldig notatdata\n"
+msgstr ""
+#: g10/call-agent.c:144 sm/call-agent.c:225
#, c-format
msgid "failed to proxy %s inquiry to client\n"
-msgstr "klarte ikke å videresende %s forespørsel til klient\n"
+msgstr ""
+#: g10/call-agent.c:170
msgid "Enter passphrase: "
-msgstr "Skriv inn passordfrase: "
+msgstr ""
+#: 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"
+msgstr ""
+#: 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)"
+msgstr ""
+#: 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"
+msgstr ""
+#: g10/call-agent.c:214 sm/call-agent.c:113 sm/call-dirmngr.c:180
msgid "Note: Outdated servers may lack important security fixes.\n"
-msgstr "Merk: Utdaterte tjenere kan mangle viktige sikkerhetsfunksjoner.\n"
+msgstr ""
+#: g10/call-agent.c:216 sm/call-agent.c:115 sm/call-dirmngr.c:182
#, c-format
msgid "Note: Use the command \"%s\" to restart them.\n"
-msgstr "Merk: Bruk kommandoen «%s» for å starte dem på nytt.\n"
+msgstr ""
+#: g10/call-agent.c:301 g10/encrypt.c:191 g10/encrypt.c:641 g10/sign.c:304
+#: sm/call-agent.c:191 sm/encrypt.c:425 sm/sign.c:345
#, c-format
msgid "%s is not compliant with %s mode\n"
-msgstr "%s kan ikke brukes i %s-modus\n"
+msgstr ""
+#: g10/card-util.c:86 g10/card-util.c:384 g10/card-util.c:1775
#, c-format
msgid "OpenPGP card not available: %s\n"
-msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
+msgstr ""
+#: g10/card-util.c:91 g10/card-util.c:1781
#, c-format
msgid "OpenPGP card no. %s detected\n"
-msgstr "Oppdaget OpenPGP-kortnummer %s\n"
+msgstr ""
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
msgid "can't do this in batch mode\n"
-msgstr "du kan ikke gjøres dette i buntmodus\n"
+msgstr ""
+#: g10/card-util.c:107
msgid "This command is only available for version 2 cards\n"
-msgstr "Denne kommandoen er bare tilgjengelig for kort av versjon 2\n"
+msgstr ""
+#: 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"
+msgstr ""
+#: g10/card-util.c:142 g10/card-util.c:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
-msgstr "Ditt valg? "
+msgstr ""
+#: g10/card-util.c:279 g10/card-util.c:330
msgid "[not set]"
-msgstr "[ikke valgt]"
+msgstr ""
+#: g10/card-util.c:534
msgid "male"
-msgstr "mann"
+msgstr ""
+#: g10/card-util.c:535
msgid "female"
-msgstr "dame"
+msgstr ""
+#: g10/card-util.c:535
msgid "unspecified"
-msgstr "uspesifisert"
+msgstr ""
+#: g10/card-util.c:562
msgid "not forced"
-msgstr "ikke tvunget"
+msgstr ""
+#: g10/card-util.c:562
msgid "forced"
-msgstr "tvunget"
+msgstr ""
+#: g10/card-util.c:712
msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr "Feil: Bare ren ASCII er foreløpig tillatt.\n"
+msgstr ""
+#: g10/card-util.c:714
msgid "Error: The \"<\" character may not be used.\n"
-msgstr "Feil: tegnet «<» kan ikke brukes.\n"
+msgstr ""
+#: g10/card-util.c:716
msgid "Error: Double spaces are not allowed.\n"
-msgstr "Feil: Doble mellomrom er ikke tillatt.\n"
+msgstr ""
+#: g10/card-util.c:733
msgid "Cardholder's surname: "
-msgstr "Kortholders etternavn: "
+msgstr ""
+#: g10/card-util.c:735
msgid "Cardholder's given name: "
-msgstr "Kortholders fornavn: "
+msgstr ""
+#: g10/card-util.c:753
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
-msgstr "Feil: Det kombinerte navnet er for langt (grensa går ved %d tegn).\n"
+msgstr ""
+#: g10/card-util.c:774
msgid "URL to retrieve public key: "
-msgstr "Adresse for henting av offentlig nøkkel: "
+msgstr ""
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, c-format
msgid "error reading '%s': %s\n"
-msgstr "feil under lesing av «%s»: %s\n"
+msgstr ""
- #: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
-msgstr "feil under skriving av «%s»: %s\n"
+msgstr ""
+#: g10/card-util.c:928
msgid "Login data (account name): "
-msgstr "Logindata (kontonavn): "
+msgstr ""
+#: g10/card-util.c:966
msgid "Private DO data: "
-msgstr "Privat DO-data: "
+msgstr ""
+#: g10/card-util.c:1051
msgid "Language preferences: "
-msgstr "Språkoppsett: "
+msgstr ""
+#: g10/card-util.c:1059
msgid "Error: invalid length of preference string.\n"
-msgstr "Feil: oppsettsstreng har ugyldig lengde.\n"
+msgstr ""
+#: g10/card-util.c:1068
msgid "Error: invalid characters in preference string.\n"
-msgstr "Feil: oppsettsstreng inneholder ugyldige tegn.\n"
+msgstr ""
+#: g10/card-util.c:1090
msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "Kjønn ((M)askulint, (F)eminint eller mellomrom): "
+msgstr ""
+#: g10/card-util.c:1104
msgid "Error: invalid response.\n"
-msgstr "Feil: ugyldig svar.\n"
+msgstr ""
+#: g10/card-util.c:1126
msgid "CA fingerprint: "
-msgstr "CA-fingeravtrykk: "
+msgstr ""
+#: g10/card-util.c:1149
msgid "Error: invalid formatted fingerprint.\n"
-msgstr "Feil: feilformatert fingeravtrykk.\n"
+msgstr ""
+#: g10/card-util.c:1199
#, c-format
msgid "key operation not possible: %s\n"
-msgstr "klarte ikke å utføre nøkkelhandling: %s\n"
+msgstr ""
+#: g10/card-util.c:1200
msgid "not an OpenPGP card"
-msgstr "ikke et OpenPGP-kort"
+msgstr ""
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, c-format
msgid "error getting current key info: %s\n"
-msgstr "feil under henting av nøkkelinfo: %s\n"
+msgstr ""
+#: g10/card-util.c:1300
msgid "Replace existing key? (y/N) "
-msgstr "Erstatte eksisterende nøkkel? (j/N) "
+msgstr ""
+#: 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 ""
-"MERK: Det er ingen garanti for at kortet støtter forespurt størrelse.\n"
-" Se dokumentasjon for kortet du bruker og finn ut hvilke størrelser \n"
-" det tillater hvis nøkkelgenerering mislykkes.\n"
+#: 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) "
+msgstr ""
+#: 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) "
+msgstr ""
+#: 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) "
+msgstr ""
-#, fuzzy, c-format
-#| msgid "The card will now be re-configured to generate a key of %u bits\n"
+#: g10/card-util.c:1358
+#, c-format
msgid "The card will now be re-configured to generate a key of type: %s\n"
-msgstr "Kortet blir nå satt opp på nytt for å lage nøkkel på %u bit\n"
+msgstr ""
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
-msgstr "rundet opp til %u bit\n"
+msgstr ""
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 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"
+msgstr ""
+#: g10/card-util.c:1382
#, 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"
+msgstr ""
+#: g10/card-util.c:1410
#, 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"
+msgstr ""
+#: g10/card-util.c:1434
msgid "Make off-card backup of encryption key? (Y/n) "
-msgstr "Lage sikkerhetskopi av krypteringsnøkler utenfor kortet? (J/n) "
+msgstr ""
+#: g10/card-util.c:1448
msgid "Note: keys are already stored on the card!\n"
-msgstr "MERK: det ligger allerede nøkler på kortet.\n"
+msgstr ""
+#: g10/card-util.c:1451
msgid "Replace existing keys? (y/N) "
-msgstr "Erstatte eksisterende nøkler? (j/N) "
+msgstr ""
+#: g10/card-util.c:1463
#, 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-koder fra fabrikk:\n"
-" PIN = «%s» Admin-PIN = «%s»\n"
-"Du bør endre disse med kommandoen «--change-pin»\n"
+#: g10/card-util.c:1529
msgid "Please select the type of key to generate:\n"
-msgstr "Velg hvilken type nøkkel du vil lage:\n"
+msgstr ""
+#: g10/card-util.c:1531 g10/card-util.c:1651
msgid " (1) Signature key\n"
-msgstr " (1) Signaturnøkkel\n"
+msgstr ""
+#: g10/card-util.c:1532 g10/card-util.c:1653
msgid " (2) Encryption key\n"
-msgstr " (2) Krypteringsnøkkel\n"
+msgstr ""
+#: g10/card-util.c:1533 g10/card-util.c:1655
msgid " (3) Authentication key\n"
-msgstr " (3) Autentiseringsnøkkel\n"
+msgstr ""
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
-msgstr "Ugyldig valg.\n"
+msgstr ""
+#: g10/card-util.c:1648
msgid "Please select where to store the key:\n"
-msgstr "velg hvor nøkkelen skal lagres:\n"
+msgstr ""
+#: g10/card-util.c:1694
#, c-format
msgid "KEYTOCARD failed: %s\n"
-msgstr "KEYTOCARD mislyktes: %s\n"
+msgstr ""
+#: g10/card-util.c:1787
msgid "This command is not supported by this card\n"
-msgstr "Denne kommandoen støttes ikke av dette kortet\n"
+msgstr ""
+#: g10/card-util.c:1792
msgid "Note: This command destroys all keys stored on the card!\n"
-msgstr "Merk: denne kommandoen ødelegger alle nøkler på kortet.\n"
+msgstr ""
+#: g10/card-util.c:1795
msgid "Continue? (y/N) "
-msgstr "Vil du fortsette? (j/N) "
+msgstr ""
+#: g10/card-util.c:1800
msgid "Really do a factory reset? (enter \"yes\") "
-msgstr "Er du sikker på at du vil gjenopprette fabrikkoppsett? (skriv «ja») "
+msgstr ""
+#: g10/card-util.c:1875 g10/keyedit.c:1256
msgid "quit this menu"
-msgstr "gå ut av denne menyen"
+msgstr ""
+#: g10/card-util.c:1877
msgid "show admin commands"
-msgstr "vis admin-kommandoer"
+msgstr ""
+#: g10/card-util.c:1878 g10/keyedit.c:1259
msgid "show this help"
-msgstr "vis denne hjelpeteksten"
+msgstr ""
+#: g10/card-util.c:1880
msgid "list all available data"
-msgstr "vis alle tilgjengelige data"
+msgstr ""
+#: g10/card-util.c:1883
msgid "change card holder's name"
-msgstr "endre kortholders navn"
+msgstr ""
+#: g10/card-util.c:1884
msgid "change URL to retrieve key"
-msgstr "endre adresse for å hente nøkkel"
+msgstr ""
+#: g10/card-util.c:1885
msgid "fetch the key specified in the card URL"
-msgstr "hent nøkkel som ligger i kortets adresse"
+msgstr ""
+#: g10/card-util.c:1886
msgid "change the login name"
-msgstr "endre brukernavn"
+msgstr ""
+#: g10/card-util.c:1887
msgid "change the language preferences"
-msgstr "endre språkoppsett"
+msgstr ""
+#: g10/card-util.c:1888
msgid "change card holder's sex"
-msgstr "endre kortholders kjønn"
+msgstr ""
+#: g10/card-util.c:1889
msgid "change a CA fingerprint"
-msgstr "endre CA-fingeravtrykk"
+msgstr ""
+#: g10/card-util.c:1890
msgid "toggle the signature force PIN flag"
-msgstr "slå av på tvungen bruk av signatur-PIN"
+msgstr ""
+#: g10/card-util.c:1891
msgid "generate new keys"
-msgstr "lag nye nøkler"
+msgstr ""
+#: g10/card-util.c:1892
msgid "menu to change or unblock the PIN"
-msgstr "meny for å endre eller fjerne blokkering av PIN"
+msgstr ""
+#: g10/card-util.c:1893
msgid "verify the PIN and list all data"
-msgstr "bekrefte PIN og vise alle data"
+msgstr ""
+#: g10/card-util.c:1894
msgid "unblock the PIN using a Reset Code"
-msgstr "fjern PIN-blokkering med en tilbakestillingskode"
+msgstr ""
+#: g10/card-util.c:1895
msgid "destroy all keys and data"
-msgstr "ødelegg alle nøkler og data"
+msgstr ""
+#: g10/card-util.c:2019
msgid "gpg/card> "
-msgstr "gpg/kort> "
+msgstr ""
+#: g10/card-util.c:2060
msgid "Admin-only command\n"
-msgstr "Admin-reservert kommando\n"
+msgstr ""
+#: g10/card-util.c:2091
msgid "Admin commands are allowed\n"
-msgstr "Admin-kommandoer er tillatt\n"
+msgstr ""
+#: g10/card-util.c:2093
msgid "Admin commands are not allowed\n"
-msgstr "Admin-kommandoer er ikke tillatt\n"
+msgstr ""
+#: g10/card-util.c:2188 g10/keyedit.c:2224
msgid "Invalid command (try \"help\")\n"
-msgstr "Ugyldig kommando (prøv «help»)\n"
+msgstr ""
+#: 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"
+msgstr ""
+#: g10/decrypt.c:246 g10/gpg.c:5017 g10/keyring.c:399 g10/keyring.c:747
#, c-format
msgid "can't open '%s'\n"
-msgstr "klarte ikke å åpne «%s»\n"
+msgstr ""
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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"
+msgstr ""
- #: g10/delkey.c:88 g10/export.c:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
-msgstr "feil under lesing av nøkkelblokk: %s\n"
+msgstr ""
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, c-format
msgid "key \"%s\" not found\n"
-msgstr "fant ikke nøkkelen «%s»\n"
+msgstr ""
+#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
-msgstr "(med mindre du oppgir nøkkel ved hjelp av fingeravtrykk)\n"
+msgstr ""
+#: g10/delkey.c:135
msgid "can't do this in batch mode without \"--yes\"\n"
-msgstr "du må bruke «--yes» for å gjøre dette i buntmodus\n"
+msgstr ""
+#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
-msgstr "Vil du slette denne nøkkelen fra nøkkelknippet? (j/N) "
+msgstr ""
+#: g10/delkey.c:158
msgid "This is a secret key! - really delete? (y/N) "
msgstr ""
-"Dette er en hemmelig nøkkel. Er du sikker på at du vil slette den? (j/N) "
+#: g10/delkey.c:202
#, c-format
msgid "deleting secret %s failed: %s\n"
-msgstr "sletting av hemmelig nøkkel %s mislyktes: %s\n"
+msgstr ""
+#: g10/delkey.c:204
msgid "key"
-msgstr "nøkkel"
+msgstr ""
+#: g10/delkey.c:204
msgid "subkey"
-msgstr "undernøkkel"
+msgstr ""
+#: g10/delkey.c:227
#, c-format
msgid "deleting keyblock failed: %s\n"
-msgstr "sletting av nøkkelblokk mislyktes: %s\n"
+msgstr ""
+#: g10/delkey.c:240
msgid "ownertrust information cleared\n"
-msgstr "informasjon om eiertillit er fjernet\n"
+msgstr ""
+#: g10/delkey.c:276
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "det finnes en hemmelig nøkkel for offentlig nøkkel «%s».\n"
+msgstr ""
+#: g10/delkey.c:278
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
-msgstr "bruk valget «--delete-secret-keys» for å slette den først.\n"
+msgstr ""
+#: g10/encrypt.c:244 g10/sign.c:1336
#, c-format
msgid "error creating passphrase: %s\n"
-msgstr "feil under opprettelse av passordfrase: %s\n"
+msgstr ""
+#: 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"
+msgstr ""
+#: g10/encrypt.c:265
#, c-format
msgid "using cipher %s\n"
-msgstr "bruker krypteringsmetode %s\n"
+msgstr ""
+#: g10/encrypt.c:275 g10/encrypt.c:689
#, c-format
msgid "'%s' already compressed\n"
-msgstr "«%s» er allerede komprimert\n"
+msgstr ""
+#: 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"
+msgstr ""
+#: g10/encrypt.c:570
#, c-format
msgid "reading from '%s'\n"
-msgstr "leser fra «%s»\n"
+msgstr ""
+#: g10/encrypt.c:618
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
-"ADVARSEL: tvungen bruk av symmetrisk krypt.metode %s (%d) bryter med "
-"mottakers oppsett\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, c-format
msgid "cipher algorithm '%s' may not be used in %s mode\n"
-msgstr "du kan ikke bruke algoritme «%s» i %s-modus\n"
+msgstr ""
+#: g10/encrypt.c:661 sm/encrypt.c:489
#, c-format
msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
-msgstr "ADVARSEL: nøkkel %s egner seg ikke for kryptering i %s-modus\n"
+msgstr ""
+#: g10/encrypt.c:772 g10/sign.c:1028
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr ""
-"ADVARSEL: tvungen bruk av komprimeringsalgoritme %s (%d) bryter med "
-"mottakers oppsett\n"
+#: 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"
+msgstr ""
+#: g10/encrypt.c:970
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s kryptert for: «%s»\n"
+msgstr ""
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, c-format
msgid "option '%s' may not be used in %s mode\n"
-msgstr "du kan ikke bruke valget «%s» i %s-modus\n"
+msgstr ""
+#: g10/decrypt-data.c:94 g10/mainproc.c:305
#, c-format
msgid "%s encrypted data\n"
-msgstr "%s krypterte data\n"
+msgstr ""
+#: 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"
+msgstr ""
+#: g10/decrypt-data.c:176 sm/decrypt.c:130
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
@@@ -2053,378 -1616,291 +2048,378 @@@ msgstr "
msgid ""
"external program calls are disabled due to unsafe options file permissions\n"
msgstr ""
-"eksterne programkall er slått av på grunn av utrygge tillatelser til "
-"oppsettsfil\n"
+#: g10/exec.c:349
msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
-"denne plattformen krever midlertidige filer ved kall på eksterne programmer\n"
+#: g10/exec.c:427
#, c-format
msgid "unable to execute program '%s': %s\n"
-msgstr "klarte ikke å kjøre «%s»: %s\n"
+msgstr ""
+#: g10/exec.c:430
#, c-format
msgid "unable to execute shell '%s': %s\n"
-msgstr "klarte ikke å kjøre skallet «%s»: %s\n"
+msgstr ""
+#: g10/exec.c:521
#, c-format
msgid "system error while calling external program: %s\n"
-msgstr "systemfeil under kall på eksternt program: %s\n"
+msgstr ""
+#: g10/exec.c:532 g10/exec.c:599
msgid "unnatural exit of external program\n"
-msgstr "unaturlig avslutning av eksternt program\n"
+msgstr ""
+#: g10/exec.c:547
msgid "unable to execute external program\n"
-msgstr "klarte ikke å kjøre eksternt program\n"
+msgstr ""
+#: g10/exec.c:564
#, c-format
msgid "unable to read external program response: %s\n"
-msgstr "klarte ikke å lese reponsen fra eksternt program: %s\n"
+msgstr ""
+#: g10/exec.c:610 g10/exec.c:617
#, c-format
msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
-msgstr "ADVARSEL: klarte ikke å fjerne midlertidig fil (%s) «%s»: %s\n"
+msgstr ""
+#: g10/exec.c:622
#, c-format
msgid "WARNING: unable to remove temp directory '%s': %s\n"
-msgstr "ADVARSEL: klarte ikke å fjerne midlertidig mappe «%s»: %s\n"
+msgstr ""
+#: g10/export.c:106
msgid "export signatures that are marked as local-only"
-msgstr "eksportere signaturer som er markert som bare-lokale"
+msgstr ""
+#: g10/export.c:108
msgid "export attribute user IDs (generally photo IDs)"
-msgstr "eksporter bruker-id-er (generelt foto-id-er)"
+msgstr ""
+#: g10/export.c:110
msgid "export revocation keys marked as \"sensitive\""
-msgstr "eksporter opphevelsesnøkler markert som «sensitive»"
+msgstr ""
+#: g10/export.c:112
msgid "remove unusable parts from key during export"
-msgstr "fjern ubrukelige deler fra nøkkelen under eksportering"
+msgstr ""
+#: g10/export.c:114
msgid "remove as much as possible from key during export"
-msgstr "fjern så mye som mulig fra nøkkelen under eksportering"
+msgstr ""
+#: g10/export.c:120
msgid "use the GnuPG key backup format"
-msgstr "bruk GnuPG-format til sikkerhetskopiering av nøkkel"
+msgstr ""
+#: g10/export.c:1236
msgid " - skipped"
-msgstr ". Hoppet over"
+msgstr ""
+#: g10/export.c:1269 g10/import.c:1835 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"
+msgstr ""
- #: g10/export.c:1709
++#: g10/export.c:1714
#, c-format
msgid "key %s: key material on-card - skipped\n"
-msgstr "nøkkel %s: nøkkelmateriell på kort - hoppet over\n"
+msgstr ""
- #: g10/export.c:1904
++#: g10/export.c:1909
msgid "exporting secret keys not allowed\n"
-msgstr "eksportering av hemmelige nøkler er ikke tillatt\n"
+msgstr ""
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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"
+msgstr ""
- #: g10/export.c:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
-msgstr "ADVARSEL: ingenting eksportert\n"
+msgstr ""
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
+msgstr ""
+#: g10/getkey.c:256
msgid "[User ID not found]"
-msgstr "[Fant ikke bruker-ID]"
+msgstr ""
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, c-format
msgid "(check argument of option '%s')\n"
-msgstr "(kontroller argument for valget «%s»)\n"
+msgstr ""
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
-msgstr "Advarsel: «%s» må være en lang nøkkel-ID eller et fingeravtrykk\n"
+msgstr ""
+#: g10/getkey.c:545
#, c-format
msgid "error looking up: %s\n"
-msgstr "feil under oppslag av %s\n"
+msgstr ""
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, c-format
msgid "Warning: %s appears in the keyring %d times\n"
-msgstr "Advarsel: %s står oppført på nøkkelknippet %d ganger\n"
+msgstr ""
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, c-format
msgid "automatically retrieved '%s' via %s\n"
-msgstr "hentet «%s» via %s automatisk\n"
+msgstr ""
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
-msgstr "feil under henting av «%s» via %s: %s\n"
+msgstr ""
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
msgid "No fingerprint"
-msgstr "Ingen fingeravtrykk"
+msgstr ""
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, c-format
msgid "secret key \"%s\" not found: %s\n"
-msgstr "fant ikke hemmelig nøkkel «%s»: %s\n"
+msgstr ""
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, c-format
msgid "Warning: not using '%s' as default key: %s\n"
-msgstr "Advarsel: bruker ikke «%s» som forvalgt nøkkel: %s\n"
+msgstr ""
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, c-format
msgid "using \"%s\" as default secret key for signing\n"
-msgstr "bruker «%s» som forvalgt hemmelig signeringsnøkkel\n"
+msgstr ""
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
-msgstr "alle verdier som sendes til «%s» blir ignorert\n"
+msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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"
+msgstr ""
- #: g10/getkey.c:3716
++#: g10/getkey.c:3724
#, 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"
+msgstr ""
- #: g10/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, c-format
msgid "valid values for option '%s':\n"
-msgstr "følgende verdier er gyldige for «%s»:\n"
+msgstr ""
+#: g10/gpg.c:434 sm/gpgsm.c:201
msgid "make a signature"
-msgstr "lag signatur"
+msgstr ""
+#: g10/gpg.c:435
msgid "make a clear text signature"
-msgstr "lag klartekst-signatur"
+msgstr ""
+#: g10/gpg.c:437 sm/gpgsm.c:203
msgid "make a detached signature"
-msgstr "lag adskilt signatur"
+msgstr ""
+#: g10/gpg.c:438 sm/gpgsm.c:204
msgid "encrypt data"
-msgstr "krypter data"
+msgstr ""
+#: g10/gpg.c:440
msgid "encryption only with symmetric cipher"
-msgstr "krypter data (symmetrisk)"
+msgstr ""
+#: g10/gpg.c:442 sm/gpgsm.c:206
msgid "decrypt data (default)"
-msgstr "dekrypter data (forvalgt)"
+msgstr ""
+#: g10/gpg.c:444 sm/gpgsm.c:207
msgid "verify a signature"
-msgstr "bekreft signatur"
+msgstr ""
+#: g10/gpg.c:446 sm/gpgsm.c:208
msgid "list keys"
-msgstr "vis nøkler"
+msgstr ""
+#: g10/gpg.c:448
msgid "list keys and signatures"
-msgstr "vis nøkler og signaturer"
+msgstr ""
+#: g10/gpg.c:451
msgid "list and check key signatures"
-msgstr "vis og kontroller nøkkelsignaturer"
+msgstr ""
+#: g10/gpg.c:453 sm/gpgsm.c:213
msgid "list keys and fingerprints"
-msgstr "vis nøkler og fingeravtrykk"
+msgstr ""
+#: g10/gpg.c:454 sm/gpgsm.c:211
msgid "list secret keys"
-msgstr "vis hemmelige nøkler"
+msgstr ""
+#: g10/gpg.c:456 sm/gpgsm.c:214
msgid "generate a new key pair"
-msgstr "lag nytt nøkkelpar"
+msgstr ""
+#: g10/gpg.c:459
msgid "quickly generate a new key pair"
-msgstr "lag nytt nøkkelpar raskt"
+msgstr ""
+#: g10/gpg.c:462
msgid "quickly add a new user-id"
-msgstr "legg til en ny bruker-ID raskt"
+msgstr ""
+#: g10/gpg.c:467
msgid "quickly revoke a user-id"
-msgstr "opphev bruker-ID raskt"
+msgstr ""
+#: g10/gpg.c:470
msgid "quickly set a new expiration date"
-msgstr "endre utløpsdato raskt"
+msgstr ""
+#: g10/gpg.c:473
msgid "full featured key pair generation"
-msgstr "fullverdig generering av nøkkelpar"
+msgstr ""
+#: g10/gpg.c:476
msgid "generate a revocation certificate"
-msgstr "lag opphevelsessertifikat"
+msgstr ""
+#: g10/gpg.c:479 sm/gpgsm.c:217
msgid "remove keys from the public keyring"
-msgstr "fjern nøkler fra offentlig nøkkelknippe"
+msgstr ""
+#: g10/gpg.c:481
msgid "remove keys from the secret keyring"
-msgstr "fjern nøkler fra hemmelig nøkkelknippe"
+msgstr ""
+#: g10/gpg.c:483
msgid "quickly sign a key"
-msgstr "hurtigsigner nøkkel"
+msgstr ""
+#: g10/gpg.c:485
msgid "quickly sign a key locally"
-msgstr "hurtigsigner nøkkel lokalt"
+msgstr ""
+#: g10/gpg.c:486
msgid "sign a key"
-msgstr "signer nøkkel"
+msgstr ""
+#: g10/gpg.c:487
msgid "sign a key locally"
-msgstr "signer nøkkel lokalt"
+msgstr ""
+#: g10/gpg.c:488
msgid "sign or edit a key"
-msgstr "signer eller rediger nøkkel"
+msgstr ""
+#: g10/gpg.c:490 sm/gpgsm.c:235
msgid "change a passphrase"
-msgstr "endre passordfrase"
+msgstr ""
+#: g10/gpg.c:494
msgid "export keys"
-msgstr "eksporter nøkler"
+msgstr ""
+#: g10/gpg.c:495
msgid "export keys to a keyserver"
-msgstr "eksporter nøkler til nøkkeltjener"
+msgstr ""
+#: g10/gpg.c:496
msgid "import keys from a keyserver"
-msgstr "importer nøkler fra nøkkeltjener"
+msgstr ""
+#: g10/gpg.c:499
msgid "search for keys on a keyserver"
-msgstr "søk etter nøkler på nøkkeltjener"
+msgstr ""
+#: g10/gpg.c:501
msgid "update all keys from a keyserver"
-msgstr "oppdater alle nøkler fra nøkkeltjener"
+msgstr ""
+#: g10/gpg.c:507
msgid "import/merge keys"
-msgstr "importer/slå sammen nøkler"
+msgstr ""
+#: g10/gpg.c:510
msgid "print the card status"
-msgstr "vis kortstatus"
+msgstr ""
+#: g10/gpg.c:511
msgid "change data on a card"
-msgstr "endre data på kort"
+msgstr ""
+#: g10/gpg.c:513
msgid "change a card's PIN"
-msgstr "endre PIN på kort"
+msgstr ""
+#: g10/gpg.c:525
msgid "update the trust database"
-msgstr "oppdater tillitsdatabase"
+msgstr ""
+#: g10/gpg.c:534
msgid "print message digests"
-msgstr "skriv ut kontrollsum av melding"
+msgstr ""
+#: g10/gpg.c:537 sm/gpgsm.c:230
msgid "run in server mode"
-msgstr "kjør i tjenermodus"
+msgstr ""
+#: g10/gpg.c:539
msgid "|VALUE|set the TOFU policy for a key"
-msgstr "|VERDI|endre TOFU-regler for nøkkel"
+msgstr ""
+#: g10/gpg.c:543 sm/gpgsm.c:249
msgid "create ascii armored output"
-msgstr "lag ASCII-beskyttet utdata"
+msgstr ""
+#: g10/gpg.c:546 sm/gpgsm.c:265
msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|BRUKER-ID|krypter for valgt BRUKER-ID"
+msgstr ""
+#: g10/gpg.c:562 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"
+msgstr ""
+#: g10/gpg.c:568
msgid "|N|set compress level to N (0 disables)"
-msgstr "|N|endre komprimeringsnivå til N (0 for å slå av)"
+msgstr ""
+#: g10/gpg.c:575
msgid "use canonical text mode"
-msgstr "bruk kanonisk tekstmodus"
+msgstr ""
+#: g10/gpg.c:592 g10/gpgv.c:80 sm/gpgsm.c:303
msgid "|FILE|write output to FILE"
-msgstr "|FILE|skriv utdata til valgt FIL"
+msgstr ""
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
-msgstr "ikke utfør valgte endringer"
+msgstr ""
+#: g10/gpg.c:608
msgid "prompt before overwriting"
-msgstr "spør før overskriving"
+msgstr ""
+#: g10/gpg.c:658
msgid "use strict OpenPGP behavior"
-msgstr "bruk streng OpenPGP-oppførsel"
+msgstr ""
+#: g10/gpg.c:684 sm/gpgsm.c:358
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2544,445 -2013,347 +2539,445 @@@ msgstr "
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
-msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av oppsettsfil «%s»\n"
+msgstr ""
+#: g10/gpg.c:1612
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
-msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av utvidelse «%s»\n"
+msgstr ""
+#: g10/gpg.c:1828
#, c-format
msgid "unknown configuration item '%s'\n"
-msgstr "oppsettselementet «%s» er ukjent\n"
+msgstr ""
+#: g10/gpg.c:1943
msgid "display photo IDs during key listings"
-msgstr "vis foto-id-er i nøkkelvisning"
+msgstr ""
+#: g10/gpg.c:1945
msgid "show key usage information during key listings"
-msgstr "vis informasjon om nøkkelbruk i nøkkelvisning"
+msgstr ""
+#: g10/gpg.c:1947
msgid "show policy URLs during signature listings"
-msgstr "vis regeladresser i signaturvisning"
+msgstr ""
+#: g10/gpg.c:1949
msgid "show all notations during signature listings"
-msgstr "vis alle notater i signaturvisning"
+msgstr ""
+#: g10/gpg.c:1951
msgid "show IETF standard notations during signature listings"
-msgstr "vis IETF-standardnotater under signaturvisning"
+msgstr ""
+#: g10/gpg.c:1955
msgid "show user-supplied notations during signature listings"
-msgstr "vis brukervalgte notater under signaturvisning"
+msgstr ""
+#: g10/gpg.c:1957
msgid "show preferred keyserver URLs during signature listings"
-msgstr "vis foretrukne nøkkeltjener-adresser under signaturvisning"
+msgstr ""
+#: g10/gpg.c:1959
msgid "show user ID validity during key listings"
-msgstr "vis gyldighet for bruker-ID under nøkkelvisning"
+msgstr ""
+#: g10/gpg.c:1961
msgid "show revoked and expired user IDs in key listings"
-msgstr "vis opphevede og utgåtte bruker-id-er i nøkkelvisning"
+msgstr ""
+#: g10/gpg.c:1963
msgid "show revoked and expired subkeys in key listings"
-msgstr "vis opphevede og utgåtte undernøkler i nøkkelvisning"
+msgstr ""
+#: g10/gpg.c:1965
msgid "show the keyring name in key listings"
-msgstr "vis nøkkelknippe-navn i nøkkelvisning"
+msgstr ""
+#: g10/gpg.c:1967
msgid "show expiration dates during signature listings"
-msgstr "vis utløpsdatoer i nøkkelvisning"
+msgstr ""
+#: g10/gpg.c:2080
#, c-format
msgid "unknown TOFU policy '%s'\n"
-msgstr "«%s» er et ukjent TOFU-regelverk\n"
+msgstr ""
+#: g10/gpg.c:2082
msgid "(use \"help\" to list choices)\n"
-msgstr "(bruk «help» for å vise valg)\n"
+msgstr ""
+#: g10/gpg.c:2233
#, c-format
msgid "Note: old default options file '%s' ignored\n"
-msgstr "Merk: gammel standardvalgfil «%s» ble ignorert\n"
+msgstr ""
+#: g10/gpg.c:2850 g10/gpg.c:3656 g10/gpg.c:3668
#, c-format
msgid "Note: %s is not for normal use!\n"
-msgstr "Merk: %s er ikke ment for vanlig bruk.\n"
+msgstr ""
+#: g10/gpg.c:3030 g10/gpg.c:3042
#, c-format
msgid "'%s' is not a valid signature expiration\n"
-msgstr "«%s» er en ugyldig signatur-utløpstid\n"
+msgstr ""
+#: g10/gpg.c:3064
#, c-format
msgid "\"%s\" is not a proper mail address\n"
-msgstr "«%s» er en ugyldig e-postadresse\n"
+msgstr ""
+#: g10/gpg.c:3096 sm/gpgsm.c:1162
#, c-format
msgid "invalid pinentry mode '%s'\n"
-msgstr "PIN-inntastingsmodus «%s» er ugyldig\n"
+msgstr ""
+#: g10/gpg.c:3151
#, c-format
msgid "'%s' is not a valid character set\n"
-msgstr "«%s» er ikke et gyldig tegnsett\n"
+msgstr ""
+#: g10/gpg.c:3173 g10/gpg.c:3379 g10/keyedit.c:5008
msgid "could not parse keyserver URL\n"
-msgstr "klarte ikke å tolke nøkkeltjener-adresse\n"
+msgstr ""
+#: g10/gpg.c:3191
#, c-format
msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: ugyldige nøkkeltjener-valg\n"
+msgstr ""
+#: g10/gpg.c:3194
msgid "invalid keyserver options\n"
-msgstr "ugyldige nøkkeltjener-valg\n"
+msgstr ""
+#: g10/gpg.c:3201
#, c-format
msgid "%s:%d: invalid import options\n"
-msgstr "%s:%d: ugyldige importeringsvalg\n"
+msgstr ""
+#: g10/gpg.c:3204
msgid "invalid import options\n"
-msgstr "ugyldige importeringsvalg\n"
+msgstr ""
+#: g10/gpg.c:3210 g10/gpg.c:3225
#, c-format
msgid "invalid filter option: %s\n"
-msgstr "filtervalget %s er ugyldig\n"
+msgstr ""
+#: g10/gpg.c:3216
#, c-format
msgid "%s:%d: invalid export options\n"
-msgstr "%s:%d: ugyldige eksporteringsvalg\n"
+msgstr ""
+#: g10/gpg.c:3219
msgid "invalid export options\n"
-msgstr "ugyldige eksporteringsvalg\n"
+msgstr ""
+#: g10/gpg.c:3231
#, c-format
msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: ugyldige listevalg\n"
+msgstr ""
+#: g10/gpg.c:3234
msgid "invalid list options\n"
-msgstr "ugyldige listevalg\n"
+msgstr ""
+#: g10/gpg.c:3242
msgid "display photo IDs during signature verification"
-msgstr "vis bruker-ID under signaturbekreftelse"
+msgstr ""
+#: g10/gpg.c:3244
msgid "show policy URLs during signature verification"
-msgstr "vis adresser til retningslinjer under signaturbekreftelse"
+msgstr ""
+#: g10/gpg.c:3246
msgid "show all notations during signature verification"
-msgstr "vis alle merknader under signaturbekreftelse"
+msgstr ""
+#: g10/gpg.c:3248
msgid "show IETF standard notations during signature verification"
-msgstr "vis IETF-standardnotater under signaturbekreftelse"
+msgstr ""
+#: g10/gpg.c:3252
msgid "show user-supplied notations during signature verification"
-msgstr "vis selvvalgte merknader under signaturbekreftelse"
+msgstr ""
+#: g10/gpg.c:3254
msgid "show preferred keyserver URLs during signature verification"
-msgstr "vis adresser til foretrukne nøkkeltjenere under signaturbekreftelse"
+msgstr ""
+#: g10/gpg.c:3256
msgid "show user ID validity during signature verification"
-msgstr "vis gyldighet for bruker-ID under signaturbekreftelse"
+msgstr ""
+#: g10/gpg.c:3258
msgid "show revoked and expired user IDs in signature verification"
-msgstr "vis opphevede og utgåtte bruker-id-er under signaturbekreftelse"
+msgstr ""
+#: g10/gpg.c:3260
msgid "show only the primary user ID in signature verification"
-msgstr "bare vis primærbrukerens ID under signaturbekreftelse"
+msgstr ""
+#: g10/gpg.c:3262
msgid "validate signatures with PKA data"
-msgstr "kontroller signaturer som har PKA-data"
+msgstr ""
+#: g10/gpg.c:3264
msgid "elevate the trust of signatures with valid PKA data"
-msgstr "øk tillitsnivå for signaturer med gyldige PKA-data"
+msgstr ""
+#: g10/gpg.c:3271
#, c-format
msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d: ugyldige kontrollvalg\n"
+msgstr ""
+#: g10/gpg.c:3274
msgid "invalid verify options\n"
-msgstr "ugyldige kontrollvalg\n"
+msgstr ""
+#: g10/gpg.c:3281
#, c-format
msgid "unable to set exec-path to %s\n"
-msgstr "klarte ikke å endre «exec»-sti til %s\n"
+msgstr ""
+#: g10/gpg.c:3482
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
-msgstr "%s:%d: ugyldig «auto-key-locate»-liste\n"
+msgstr ""
+#: g10/gpg.c:3485
msgid "invalid auto-key-locate list\n"
-msgstr "ugyldig «auto-key-locate»-liste\n"
+msgstr ""
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
-msgstr "ADVARSEL: programmet kan lage en kjernefil.\n"
+msgstr ""
+#: g10/gpg.c:3649
#, c-format
msgid "WARNING: %s overrides %s\n"
-msgstr "ADVARSEL: %s overstyrere %s\n"
+msgstr ""
+#: g10/gpg.c:3658
#, c-format
msgid "%s not allowed with %s!\n"
-msgstr "du kan ikke bruke %s med %s.\n"
+msgstr ""
+#: g10/gpg.c:3661
#, c-format
msgid "%s makes no sense with %s!\n"
-msgstr "%s gir ikke mening med %s.\n"
+msgstr ""
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
-msgstr "ADVARSEL: kjører med falsk systemtid: "
+msgstr ""
+#: g10/gpg.c:3697
#, 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"
+msgstr ""
- #: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
-msgstr "valgt krypteringsalgoritme er ugyldig\n"
+msgstr ""
+#: g10/gpg.c:3744
msgid "selected compression algorithm is invalid\n"
-msgstr "valgt komprimeringsalgoritme er ugyldig\n"
+msgstr ""
+#: g10/gpg.c:3750
msgid "selected certification digest algorithm is invalid\n"
-msgstr "valgt kontrollsum-algoritme for sertifisering er ugyldig\n"
+msgstr ""
+#: g10/gpg.c:3765
msgid "completes-needed must be greater than 0\n"
-msgstr "«completes-needed» må være større enn 0\n"
+msgstr ""
+#: g10/gpg.c:3767
msgid "marginals-needed must be greater than 1\n"
-msgstr "«marginals-needed» må være større enn 1\n"
+msgstr ""
+#: g10/gpg.c:3769
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"
+msgstr ""
+#: g10/gpg.c:3771
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"
+msgstr ""
+#: g10/gpg.c:3773
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"
+msgstr ""
+#: g10/gpg.c:3776
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
-msgstr "Merk: enkel S2K-modus (0) er sterkt frarådet\n"
+msgstr ""
+#: g10/gpg.c:3780
msgid "invalid S2K mode; must be 0, 1 or 3\n"
-msgstr "ugyldig S2K-modus (må være 0, 1 eller 3)\n"
+msgstr ""
+#: g10/gpg.c:3787
msgid "invalid default preferences\n"
-msgstr "ugyldig standardoppsett\n"
+msgstr ""
+#: g10/gpg.c:3791
msgid "invalid personal cipher preferences\n"
-msgstr "ugyldig personlig oppsett av krypteringsmetode\n"
+msgstr ""
+#: g10/gpg.c:3795
msgid "invalid personal digest preferences\n"
-msgstr "ugyldig personlig oppsett av kontrollsummetode\n"
+msgstr ""
+#: g10/gpg.c:3799
msgid "invalid personal compress preferences\n"
-msgstr "ugyldig personlig oppsett av komprimeringsmetode\n"
+msgstr ""
+#: g10/gpg.c:3835
#, c-format
msgid "%s does not yet work with %s\n"
-msgstr "%s virker ikke enda med %s\n"
+msgstr ""
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 sm/sign.c:478 sm/verify.c:473
#, c-format
msgid "digest algorithm '%s' may not be used in %s mode\n"
-msgstr "du kan ikke bruke algoritme «%s» i %s-modus\n"
+msgstr ""
+#: g10/gpg.c:3894
#, c-format
msgid "compression algorithm '%s' may not be used in %s mode\n"
-msgstr "du kan ikke bruke komprimeringsalgoritme «%s» i %s-modus\n"
+msgstr ""
+#: g10/gpg.c:4034
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
-msgstr "klarte ikke å starte tillitsdatabase (TrustDB): %s\n"
+msgstr ""
+#: g10/gpg.c:4046
msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr "ADVARSEL: mottakere (-r) valgt uten offentlig nøkkelkryptering\n"
+msgstr ""
+#: g10/gpg.c:4118
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
-msgstr "symmetrisk kryptering av «%s» mislyktes: %s\n"
+msgstr ""
+#: g10/gpg.c:4147
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-msgstr "du kan ikke bruke «--symmetric --encrypt» og «--s2k-mode 0» samtidig\n"
+msgstr ""
+#: g10/gpg.c:4150
#, c-format
msgid "you cannot use --symmetric --encrypt in %s mode\n"
-msgstr "du kan ikke velge --symmetric --encrypt i %s-modus\n"
+msgstr ""
+#: g10/gpg.c:4208
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:4211
#, c-format
msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
-msgstr "du kan ikke velge --symmetric --sign --encrypt i %s-modus\n"
+msgstr ""
+#: g10/gpg.c:4568 g10/keyserver.c:1846
#, c-format
msgid "keyserver send failed: %s\n"
-msgstr "sending til nøkkeltjener mislyktes: %s\n"
+msgstr ""
+#: g10/gpg.c:4573
#, c-format
msgid "keyserver receive failed: %s\n"
-msgstr "mottak fra nøkkeltjener mislyktes: %s\n"
+msgstr ""
+#: g10/gpg.c:4579
#, c-format
msgid "key export failed: %s\n"
-msgstr "nøkkeleksport mislyktes: %s\n"
+msgstr ""
+#: g10/gpg.c:4592
#, c-format
msgid "export as ssh key failed: %s\n"
-msgstr "eksportering som ssh-nøkkel mislyktes: %s\n"
+msgstr ""
+#: g10/gpg.c:4604
#, c-format
msgid "keyserver search failed: %s\n"
-msgstr "søk på nøkkeltjener mislyktes: %s\n"
+msgstr ""
+#: g10/gpg.c:4617
#, c-format
msgid "keyserver refresh failed: %s\n"
-msgstr "oppdatering av nøkkeltjener mislyktes: %s\n"
+msgstr ""
+#: g10/gpg.c:4684
#, c-format
msgid "dearmoring failed: %s\n"
-msgstr "dearmoring failed: %s\n"
+msgstr ""
+#: g10/gpg.c:4695
#, c-format
msgid "enarmoring failed: %s\n"
-msgstr "enarmoring failed: %s\n"
+msgstr ""
+#: g10/gpg.c:4787
#, c-format
msgid "invalid hash algorithm '%s'\n"
-msgstr "«%s» er en ugyldig summeringsalgoritme\n"
+msgstr ""
+#: g10/gpg.c:4936 g10/tofu.c:2154
#, c-format
msgid "error parsing key specification '%s': %s\n"
-msgstr "feil under tolking av nøkkelspesifikasjon «%s»: %s\n"
+msgstr ""
+#: g10/gpg.c:4948
#, 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:4996
msgid "WARNING: no command supplied. Trying to guess what you mean ...\n"
-msgstr "ADVARSEL: ingen kommando valgt. Prøver å gjette hva du mener …\n"
+msgstr ""
+#: g10/gpg.c:5007
msgid "Go ahead and type your message ...\n"
-msgstr "Skriv inn melding …\n"
+msgstr ""
+#: g10/gpg.c:5346
msgid "the given certification policy URL is invalid\n"
-msgstr "valgt adresse for sertifikasjonsregler er ugyldig\n"
+msgstr ""
+#: g10/gpg.c:5348
msgid "the given signature policy URL is invalid\n"
-msgstr "valgt adresse for signaturregler er ugyldig\n"
+msgstr ""
+#: g10/gpg.c:5381
msgid "the given preferred keyserver URL is invalid\n"
-msgstr "valgt adresse for foretrukket nøkkeltjener er ugyldig\n"
+msgstr ""
+#: g10/gpgv.c:79
msgid "|FILE|take the keys from the keyring FILE"
-msgstr "|FIL|hent nøkler fra valgt nøkkelknippe-FIL"
+msgstr ""
+#: g10/gpgv.c:82
msgid "make timestamp conflicts only a warning"
-msgstr "la konflikter mellom tidsstempler bare være en advarsel"
+msgstr ""
- #: g10/gpgv.c:84 sm/gpgsm.c:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
-msgstr "|FD|skrive statusinfo til denne FD"
+msgstr ""
+#: g10/gpgv.c:89
msgid "|ALGO|reject signatures made with ALGO"
-msgstr "|ALGO|avvis signaturer som er laget med valgt ALGOritme"
+msgstr ""
+#: g10/gpgv.c:148
msgid "Usage: gpgv [options] [files] (-h for help)"
-msgstr "Bruk: gpgv [valg] [filer] (-h for hjelp)"
+msgstr ""
+#: g10/gpgv.c:150
msgid ""
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
@@@ -4213,36 -3366,31 +4208,36 @@@ msgid "
"versions\n"
" of PGP to reject this key.\n"
msgstr ""
-"ADVARSEL: Dette er en PGP2-nøkkel. Hvis du legger til et foto-ID, kan det "
-"føre til at\n"
-" enkelte PGP-versjoner avviser nøkkelen.\n"
+#: g10/keyedit.c:3945 g10/keyedit.c:4235
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) "
+msgstr ""
+#: g10/keyedit.c:3951
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"
+msgstr ""
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
-msgstr "Valgt bruker-ID finnes allerede på denne nøkkelen!\n"
+msgstr ""
+#: g10/keyedit.c:4068
msgid "Delete this good signature? (y/N/q)"
-msgstr "Slette denne gode signaturen? (j/N/a)"
+msgstr ""
+#: g10/keyedit.c:4078
msgid "Delete this invalid signature? (y/N/q)"
-msgstr "Vil du slette denne ugyldige signaturen? (j/N/q)"
+msgstr ""
+#: g10/keyedit.c:4082
msgid "Delete this unknown signature? (y/N/q)"
-msgstr "Vil du slette denne ukjente signaturen? (j/N/q)"
+msgstr ""
+#: g10/keyedit.c:4089
msgid "Really delete this self-signature? (y/N)"
-msgstr "Er du sikker på at du vil slette denne selvsignaturen? (j/N)"
+msgstr ""
+#: g10/keyedit.c:4105
#, c-format
msgid "Deleted %d signature.\n"
msgid_plural "Deleted %d signatures.\n"
@@@ -4342,218 -3475,177 +4337,218 @@@ msgstr "
#, 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:4778
msgid "Please select exactly one user ID.\n"
-msgstr "Velg én bruker-ID.\n"
+msgstr ""
+#: g10/keyedit.c:4819 g10/keyedit.c:4933 g10/keyedit.c:5046 g10/keyedit.c:5184
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
-msgstr "hopper over v3-selvsignatur for bruker-ID «%s»\n"
+msgstr ""
+#: g10/keyedit.c:4990
msgid "Enter your preferred keyserver URL: "
-msgstr "Skriv inn adresse til foretrukket nøkkeltjener: "
+msgstr ""
+#: g10/keyedit.c:5069
msgid "Are you sure you want to replace it? (y/N) "
-msgstr "Er du sikker på at du vil erstatte den? (j/N) "
+msgstr ""
+#: g10/keyedit.c:5070
msgid "Are you sure you want to delete it? (y/N) "
-msgstr "Er du sikker på at du vil slette den? (j/N) "
+msgstr ""
+#: g10/keyedit.c:5130
msgid "Enter the notation: "
-msgstr "Skriv inn notat: "
+msgstr ""
+#: g10/keyedit.c:5277
msgid "Proceed? (y/N) "
-msgstr "Vil du fortsette? (j/N) "
+msgstr ""
+#: g10/keyedit.c:5347
#, c-format
msgid "No user ID with index %d\n"
-msgstr "Ingen bruker-ID med indeks %d\n"
+msgstr ""
+#: g10/keyedit.c:5409
#, c-format
msgid "No user ID with hash %s\n"
-msgstr "Ingen bruker-ID med kontrollsum %s\n"
+msgstr ""
+#: g10/keyedit.c:5510
#, c-format
msgid "No subkey with key ID '%s'.\n"
-msgstr "Ingen undernøkkel med ID «%s».\n"
+msgstr ""
+#: g10/keyedit.c:5532
#, c-format
msgid "No subkey with index %d\n"
-msgstr "Ingen undernøkkel med indeks %d\n"
+msgstr ""
+#: g10/keyedit.c:5673
#, c-format
msgid "user ID: \"%s\"\n"
-msgstr "bruker-ID: «%s»\n"
+msgstr ""
+#: g10/keyedit.c:5676 g10/keyedit.c:5778 g10/keyedit.c:5826
#, c-format
msgid "signed by your key %s on %s%s%s\n"
-msgstr "signert med nøkkelen %s %s%s%s\n"
+msgstr ""
+#: g10/keyedit.c:5678 g10/keyedit.c:5780 g10/keyedit.c:5828
msgid " (non-exportable)"
-msgstr " (ikke-eksporterbar)"
+msgstr ""
+#: g10/keyedit.c:5682
#, c-format
msgid "This signature expired on %s.\n"
-msgstr "Denne signaturen utgikk %s.\n"
+msgstr ""
+#: g10/keyedit.c:5687
msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "Er du sikker på at du vil oppheve den? (j/N) "
+msgstr ""
+#: g10/keyedit.c:5692
msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "Vil du lage et opphevelsessertifikat for denne signaturen? (j/N) "
+msgstr ""
+#: g10/keyedit.c:5746
msgid "Not signed by you.\n"
-msgstr "Ikke signert av deg.\n"
+msgstr ""
+#: g10/keyedit.c:5752
#, 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"
+msgstr ""
+#: g10/keyedit.c:5781
msgid " (non-revocable)"
-msgstr " (kan ikke oppheves)"
+msgstr ""
+#: g10/keyedit.c:5788
#, c-format
msgid "revoked by your key %s on %s\n"
-msgstr "opphevet med nøkkelen %s %s\n"
+msgstr ""
+#: g10/keyedit.c:5813
msgid "You are about to revoke these signatures:\n"
-msgstr "Du er i ferd med å oppheve følgende signaturer:\n"
+msgstr ""
+#: g10/keyedit.c:5836
msgid "Really create the revocation certificates? (y/N) "
-msgstr "Er du sikker på at du vil lage opphevelsessertifikatene? (j/N) "
+msgstr ""
+#: g10/keyedit.c:5869
msgid "no secret key\n"
-msgstr "ingen hemmelig nøkkel\n"
+msgstr ""
+#: g10/keyedit.c:5917
#, 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"
+msgstr ""
+#: g10/keyedit.c:5927
#, c-format
msgid "user ID \"%s\" is already revoked\n"
-msgstr "bruker-ID «%s» er allerede opphevet\n"
+msgstr ""
+#: g10/keyedit.c:5944
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
-msgstr "ADVARSEL: en bruker-id-signatur er datert %d sekunder i framtiden\n"
+msgstr ""
+#: g10/keyedit.c:6040
msgid "Cannot revoke the last valid user ID.\n"
-msgstr "Klarte ikke å oppheve siste gyldige bruker-ID.\n"
+msgstr ""
+#: g10/keyedit.c:6078
#, c-format
msgid "Key %s is already revoked.\n"
-msgstr "Nøkkelen %s er allerede opphevet.\n"
+msgstr ""
+#: g10/keyedit.c:6140
#, c-format
msgid "Subkey %s is already revoked.\n"
-msgstr "Undernøkkel %s er allerede opphevet.\n"
+msgstr ""
+#: g10/keyedit.c:6237
#, 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"
+msgstr ""
+#: g10/keygen.c:169
#, c-format
msgid "invalid value for option '%s'\n"
-msgstr "ugyldig verdi for valg «%s»\n"
+msgstr ""
+#: g10/keygen.c:318
#, c-format
msgid "preference '%s' duplicated\n"
-msgstr "innstilling «%s» er duplisert\n"
+msgstr ""
+#: g10/keygen.c:325
msgid "too many cipher preferences\n"
-msgstr "for mange krypteringsinnstillinger\n"
+msgstr ""
+#: g10/keygen.c:327
msgid "too many digest preferences\n"
-msgstr "for mange kontrollsum-innstillinger\n"
+msgstr ""
+#: g10/keygen.c:329
msgid "too many compression preferences\n"
-msgstr "for mange komprimeringsinnstillinger\n"
+msgstr ""
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, c-format
msgid "invalid item '%s' in preference string\n"
-msgstr "«%s» er et ugyldig oppsettsvalg\n"
+msgstr ""
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
-msgstr "skriver direkte signatur\n"
+msgstr ""
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
-msgstr "skriver selvsignatur\n"
+msgstr ""
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
-msgstr "skriver nøkkelbindende signatur\n"
+msgstr ""
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
-msgstr "ugyldig nøkkelstørrelse. Bruker %u bit\n"
+msgstr ""
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
-msgstr "nøkkelstørrelse rundet opp til %u bit\n"
+msgstr ""
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-"ADVARSEL: noen OpenPGP-programmer klarer ikke å behandle DSA-nøkler med "
-"denne kontrollsum-størrelsen\n"
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
msgid "Sign"
-msgstr "Signere"
+msgstr ""
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
-msgstr "Bekrefte"
+msgstr ""
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
msgid "Encrypt"
-msgstr "Kryptere data"
+msgstr ""
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
-msgstr "Autentisere"
+msgstr ""
-# S og s for signering
-# K og k for kryptering
-# A og a for autentisering
-# Q og q for avslutte
#. 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
@@@ -4564,150 -3656,119 +4559,150 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
-msgstr "SsKkAaQq"
+msgstr ""
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
-msgstr "Mulige handlinger med en %s-nøkkel: "
+msgstr ""
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
-msgstr "Tillatte handlinger: "
+msgstr ""
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
-msgstr " (%c) Slå av/på signeringsfunksjon\n"
+msgstr ""
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
-msgstr " (%c) Slå av/på krypteringsfunksjon\n"
+msgstr ""
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
-msgstr " (%c) Slå av/på autentiseringsfunksjon\n"
+msgstr ""
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
-msgstr " (%c) Ferdig\n"
+msgstr ""
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
-msgstr "Velg hvilken type nøkkel du vil ha:\n"
+msgstr ""
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, c-format
msgid " (%d) RSA and RSA (default)\n"
-msgstr " (%d) RSA og RSA (standard)\n"
+msgstr ""
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, c-format
msgid " (%d) DSA and Elgamal\n"
-msgstr " (%d) DSA og Elgamal\n"
+msgstr ""
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
-msgstr " (%d) DSA (bare signering)\n"
+msgstr ""
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
-msgstr " (%d) RSA (bare signering)\n"
+msgstr ""
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
-msgstr " (%d) ElGamal (bare kryptering)\n"
+msgstr ""
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
-msgstr " (%d) RSA (bare kryptering)\n"
+msgstr ""
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
-msgstr " (%d) DSA (sette dine egne muligheter)\n"
+msgstr ""
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
-msgstr " (%d) RSA (sette dine egne muligheter)\n"
+msgstr ""
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, c-format
msgid " (%d) ECC and ECC\n"
-msgstr " (%d) ECC og ECC\n"
+msgstr ""
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, c-format
msgid " (%d) ECC (sign only)\n"
-msgstr " (%d) ECC (kun signering)\n"
+msgstr ""
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, c-format
msgid " (%d) ECC (set your own capabilities)\n"
-msgstr " (%d) ECC (velg funksjoner selv)\n"
+msgstr ""
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, c-format
msgid " (%d) ECC (encrypt only)\n"
-msgstr " (%d) ECC (kun kryptering)\n"
+msgstr ""
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, c-format
msgid " (%d) Existing key\n"
-msgstr " (%d) Nøkkel\n"
+msgstr ""
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
msgid "Enter the keygrip: "
-msgstr "Skriv inn nøkkelgrep: "
+msgstr ""
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
-msgstr "Ugyldig nøkkelgrep (forventer 40 heks-sifre)\n"
+msgstr ""
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
msgid "No key with this keygrip\n"
-msgstr "Ingen nøkkel med dette nøkkelgrepet\n"
+msgstr ""
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, c-format
msgid "rounded to %u bits\n"
-msgstr "rundet av til %u bit\n"
+msgstr ""
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
-msgstr "%s-nøkler må være mellom %u og %u bit lange.\n"
+msgstr ""
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
-msgstr "Hvor stor vil du at undernøkkelen skal være? (%u) "
+msgstr ""
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, c-format
msgid "What keysize do you want? (%u) "
-msgstr "Hvor stor skal nøkkelen være? (%u) "
+msgstr ""
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
-msgstr "Forespurt nøkkelstørrelse er %u bit\n"
+msgstr ""
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
msgid "Please select which elliptic curve you want:\n"
-msgstr "Velg elliptisk kurve:\n"
+msgstr ""
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -4716,8 -3777,13 +4711,8 @@@
" <n>m = key expires in n months\n"
" <n>y = key expires in n years\n"
msgstr ""
-"Velg hvor lenge nøkkelen skal være gyldig.\n"
-" 0 = nøkkelen utgår ikke\n"
-" <n> = nøkkelen utgår om n days\n"
-" <n>w = nøkkelen utgår om n weeks\n"
-" <n>m = nøkkelen utgår om n months\n"
-" <n>y = nøkkelen utgår om n years\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -4726,49 -3792,47 +4721,49 @@@
" <n>m = signature expires in n months\n"
" <n>y = signature expires in n years\n"
msgstr ""
-"Velg hvor lenge signaturen skal være gyldig.\n"
-" 0 = signaturen utgår ikke\n"
-" <n> = signaturen utgår om n days\n"
-" <n>w = signaturen utgår om n weeks\n"
-" <n>m = signaturen utgår om n months\n"
-" <n>y = signaturen utgår om n years\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
-msgstr "Nøkkelen er gyldig for? (0) "
+msgstr ""
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, c-format
msgid "Signature is valid for? (%s) "
-msgstr "Signaturen er gyldig for? (%s) "
+msgstr ""
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
-msgstr "ugyldig verdi\n"
+msgstr ""
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
msgid "Key does not expire at all\n"
-msgstr "Nøkkel utgår ikke i det hele tatt\n"
+msgstr ""
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
msgid "Signature does not expire at all\n"
-msgstr "Signaturen utgår ikke i det hele tatt\n"
+msgstr ""
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, c-format
msgid "Key expires at %s\n"
-msgstr "Nøkkel utgår %s\n"
+msgstr ""
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, c-format
msgid "Signature expires at %s\n"
-msgstr "Signaturen utgår %s\n"
+msgstr ""
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
msgstr ""
-"Systemet ditt klarer ikke å håndtere datoer etter 2038.\n"
-"Likevel håndteres det korrekt fram til 2106.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
msgid "Is this correct? (y/N) "
-msgstr "Er dette korrekt (j/N)? "
+msgstr ""
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4779,7 -3846,6 +4774,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -4788,60 -3854,57 +4783,60 @@@
" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
"\n"
msgstr ""
-"\n"
-"Du trenger en bruker-ID for å identifisere nøkkelen din.\n"
-"Programmet lageren bruker-ID ut fra fullt navn, kommentar og\n"
-"e-postadresse, som f.keks. dette:\n"
-" «Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>»\n"
-"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
-msgstr "Fullt navn: "
+msgstr ""
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
-msgstr "Ugyldig tegn i navn\n"
+msgstr ""
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
-msgstr "Tegnene «%s» og «%s» kan ikke brukes i navn\n"
+msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
-msgstr "Navn kan ikke begynne med siffer\n"
+msgstr ""
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
-msgstr "Navnet må bestå av minst 5 tegn\n"
+msgstr ""
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
-msgstr "E-postadresse: "
+msgstr ""
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
-msgstr "Ugyldig e-postadresse\n"
+msgstr ""
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
-msgstr "Kommentar: "
+msgstr ""
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
-msgstr "Ugyldig tegn i kommentar\n"
+msgstr ""
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, c-format
msgid "You are using the '%s' character set.\n"
-msgstr "Du bruker tegnsettet «%s».\n"
+msgstr ""
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
" \"%s\"\n"
"\n"
msgstr ""
-"Du valgte denne bruker-id-en («USER-ID»):\n"
-" «%s»\n"
-"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
-msgstr "Ikk bruk e-postadresse som navn eller kommentar\n"
+msgstr ""
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
@@@ -4854,166 -3917,146 +4849,166 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
-msgstr "NnKeEeRrAa"
+msgstr ""
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
-msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
+msgstr ""
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
-msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
+msgstr ""
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
msgid "Change (N)ame, (E)mail, or (Q)uit? "
-msgstr "Endre (N)avn, (E)postadresse eller (A)vslutt? "
+msgstr ""
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
-msgstr "Endre (N)avn, (E)postadresse eller (R)iktig/(A)vslutt? "
+msgstr ""
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
-msgstr "Rett opp feilen først\n"
+msgstr ""
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
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 ""
-"Vi må lage ganske mye vilkårlighetsdata. Du bør jobbe med\n"
-"andre ting (skrive på tastaturet, flytte på musa, la\n"
-"diskene jobbe) mens dette pågår. Da får\n"
-"tallgeneratoren bedre muligheter til å samle inn vilkårlighetsdata.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
-msgstr "Nøkkelgenerering mislyktes: %s\n"
+msgstr ""
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
" \"%s\"\n"
"\n"
msgstr ""
-"Lager nøkkel for:\n"
-" «%s»\n"
-"\n"
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
-msgstr "Vil du fortsette? (J/n) "
+msgstr ""
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, c-format
msgid "A key for \"%s\" already exists\n"
-msgstr "Det finnes allerede en nøkkel for «%s»\n"
+msgstr ""
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
msgid "Create anyway? (y/N) "
-msgstr "Vil du lage nøkkel likevel? (j/N) "
+msgstr ""
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
msgid "creating anyway\n"
-msgstr "lager likevel\n"
+msgstr ""
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
-"Merk: Bruk «%s %s» for å se et fullverdig dialogvindu for nøkkelgenerering.\n"
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
-msgstr "Nøkkelgenerering ble avbrutt.\n"
+msgstr ""
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, c-format
msgid "can't create backup file '%s': %s\n"
-msgstr "klarte ikke å lage sikkerhetskopifila «%s»: %s\n"
+msgstr ""
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
-msgstr "Merk: sikkerhetskopi av kortnøkkel lagret på «%s»\n"
+msgstr ""
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, c-format
msgid "writing public key to '%s'\n"
-msgstr "skriver offentlig nøkkel til «%s»\n"
+msgstr ""
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
-msgstr "fant ikke skrivbart offentlig nøkkelknippe: %s\n"
+msgstr ""
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, c-format
msgid "error writing public keyring '%s': %s\n"
-msgstr "feil under skriving av offentlig nøkkelknippe «%s»: %s\n"
+msgstr ""
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
-msgstr "offentlig og hemmelig nøkkel opprettet og signert.\n"
+msgstr ""
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
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 ""
-"Merk at denne nøkkelen ikke kan brukes til kryptering. Du bør\n"
-"vurdere å bruke kommandoen «--edit-key» for å lage en\n"
-"undernøkkel til dette formålet.\n"
- #: g10/keygen.c:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
-"nøkkel har blitt opprettet %lu sekund i framtiden (time warp- eller "
-"klokkeproblem)\n"
- #: g10/keygen.c:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
-"nøkkel har blitt opprettet %lu sekunder i framtiden (time warp- eller "
-"klokkeproblem)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
msgid "Secret parts of primary key are not available.\n"
-msgstr "Hemmelige deler av primærnøkkelen er ikke tilgjengelig.\n"
+msgstr ""
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
msgid "Secret parts of primary key are stored on-card.\n"
-msgstr "Hemmelige deler av primærnøkkelen er lagret på kort.\n"
+msgstr ""
- #: g10/keygen.c:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
msgid "Really create? (y/N) "
-msgstr "Er du sikker på at du vil fortsette? (j/N) "
+msgstr ""
+#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688
msgid "never "
-msgstr "aldri "
+msgstr ""
+#: g10/keylist.c:331
msgid "Critical signature policy: "
-msgstr "Regler for kritisk signatur: "
+msgstr ""
+#: g10/keylist.c:333
msgid "Signature policy: "
-msgstr "Regler for signatur: "
+msgstr ""
+#: g10/keylist.c:373
msgid "Critical preferred keyserver: "
-msgstr "Kritisk foretrukket nøkkeltjener: "
+msgstr ""
+#: g10/keylist.c:426
msgid "Critical signature notation: "
-msgstr "Kritisk signaturnotat: "
+msgstr ""
+#: g10/keylist.c:428
msgid "Signature notation: "
-msgstr "Signaturnotat: "
+msgstr ""
+#: g10/keylist.c:474
#, c-format
msgid "%d good signature\n"
msgid_plural "%d good signatures\n"
@@@ -5653,65 -4573,56 +5648,65 @@@ msgid "
"very large picture, your key will become very large as well!\n"
"Keeping the image close to 240x288 is a good size to use.\n"
msgstr ""
-"\n"
-"Velg et bilde som skal brukes som foto-ID. Bildet må være i JPEG-format.\n"
-"Husk at bildet lagres som en del av den offentlige nøkkelen, og at\n"
-"nøkkelstørrelsen derfor påvirkes av hvor stort bildet er.\n"
-"En oppløsning på rundt 240x288 piksler er et godt utgangspunkt.\n"
+#: g10/photoid.c:99
msgid "Enter JPEG filename for photo ID: "
-msgstr "Skriv inn JPEG-filnavn for foto-ID: "
+msgstr ""
+#: g10/photoid.c:120
#, c-format
msgid "unable to open JPEG file '%s': %s\n"
-msgstr "klarte ikke å åpne JPEG-fil «%s»: %s\n"
+msgstr ""
+#: g10/photoid.c:131
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
-msgstr "Denne JPEG-fila er veldig stor (%d byte).\n"
+msgstr ""
+#: g10/photoid.c:133
msgid "Are you sure you want to use it? (y/N) "
-msgstr "Er du sikker på at du vil bruke den? (j/N) "
+msgstr ""
+#: g10/photoid.c:149
#, c-format
msgid "'%s' is not a JPEG file\n"
-msgstr "«%s» er ikke en JPEG-fil\n"
+msgstr ""
+#: g10/photoid.c:168
msgid "Is this photo correct (y/N/q)? "
-msgstr "Er dette bildet riktig (j/N/q)? "
+msgstr ""
+#: g10/photoid.c:380
msgid "unable to display photo ID!\n"
-msgstr "klarte ikke å vise foto-ID.\n"
+msgstr ""
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
-msgstr "Ingen grunn oppgitt"
+msgstr ""
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
-msgstr "Nøkkelen er overgått"
+msgstr ""
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
-msgstr "Nøkkelen har blitt kompromittert"
+msgstr ""
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
-msgstr "Nøkkelen er ikke lengre i bruk"
+msgstr ""
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
-msgstr "Bruker-ID er ikke lenger gyldig"
+msgstr ""
+#: g10/pkclist.c:84
msgid "reason for revocation: "
-msgstr "grunnen for opphevelse: "
+msgstr ""
+#: g10/pkclist.c:100
msgid "revocation comment: "
-msgstr "kommentar til opphevelse: "
+msgstr ""
#. TRANSLATORS: These are the allowed answers in lower and
#. uppercase. Below you will find the matching strings which
@@@ -5774,20 -4675,18 +5769,20 @@@ msgid "
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
-"Laveste tillitsnivå for denne nøkkelen er: %s\n"
-"\n"
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
-msgstr "Hva velger du? "
+msgstr ""
+#: g10/pkclist.c:331
msgid "Do you really want to set this key to ultimate trust? (y/N) "
-msgstr "Er du sikker på at du vil gi denne nøkkelen fullstendig tillit? (j/N) "
+msgstr ""
+#: g10/pkclist.c:345
msgid "Certificates leading to an ultimately trusted key:\n"
-msgstr "Sertifikater som fører til en fullstendig betrodd nøkkel:\n"
+msgstr ""
+#: g10/pkclist.c:434
#, c-format
msgid "%s: There is no assurance this key belongs to the named user\n"
msgstr ""
@@@ -5899,214 -4786,174 +5894,214 @@@ msgstr "
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
-"ADVARSEL: denne nøkkelen er ikke sertifisert med tilstrekkelig "
-"tillitsverdige signaturer.\n"
+#: g10/pkclist.c:684
msgid " It is not certain that the signature belongs to the owner.\n"
-msgstr " Det er ikke sikkert at signaturen tilhører brukeren.\n"
+msgstr ""
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
-msgstr "%s: hoppet over: %s\n"
+msgstr ""
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: hoppet over. Offentlig nøkkel er ikke i bruk\n"
+msgstr ""
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
-msgstr "%s: hoppet over: offentlig nøkkel er allerede tilstede\n"
+msgstr ""
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, c-format
msgid "can't encrypt to '%s'\n"
-msgstr "klarte ikke å kryptere til «%s»\n"
+msgstr ""
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, c-format
msgid "option '%s' given, but no valid default keys given\n"
-msgstr "valgt «%s», men mangler gyldig forvalgt nøkkel\n"
+msgstr ""
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, c-format
msgid "option '%s' given, but option '%s' not given\n"
-msgstr "valgt «%s», men mangler valget «%s»\n"
+msgstr ""
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
-msgstr "Du skrev ikke inn en bruker-ID. (bruk evt. «-r»)\n"
+msgstr ""
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
-msgstr "Gjeldende mottakere:\n"
+msgstr ""
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
msgstr ""
-"\n"
-"Skriv inn bruker-ID og avslutt med tom linje: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
-msgstr "Bruker-id-en finnes ikke.\n"
+msgstr ""
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
-msgstr "hoppet over: offentlig nøkkel allerede valgt som standardmottaker\n"
+msgstr ""
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
-msgstr "Offentlig nøkkel er ikke i bruk.\n"
+msgstr ""
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
-msgstr "hoppet over: offentlig nøkkel er allerede valgt\n"
+msgstr ""
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, c-format
msgid "unknown default recipient \"%s\"\n"
-msgstr "«%s» er en ukjent standardmottaker\n"
+msgstr ""
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
-msgstr "ingen gyldige mottakere\n"
+msgstr ""
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, c-format
msgid "Note: key %s has no %s feature\n"
-msgstr "Merk: nøkkel %s har ingen %s-funksjon\n"
+msgstr ""
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, c-format
msgid "Note: key %s has no preference for %s\n"
-msgstr "Merk: nøkkel %s har ingen innstilling for %s\n"
+msgstr ""
+#: g10/plaintext.c:84
msgid "data not saved; use option \"--output\" to save it\n"
-msgstr "data ble ikke lagret. Bruk valget «--output» for å lagre\n"
+msgstr ""
+#: g10/plaintext.c:614
msgid "Detached signature.\n"
-msgstr "Adskilt signatur.\n"
+msgstr ""
+#: g10/plaintext.c:622
msgid "Please enter name of data file: "
-msgstr "Skriv inn navn på datafil: "
+msgstr ""
+#: g10/plaintext.c:659
msgid "reading stdin ...\n"
-msgstr "leser std.innkanal …\n"
+msgstr ""
+#: g10/plaintext.c:704
msgid "no signed data\n"
-msgstr "ingen signerte data\n"
+msgstr ""
+#: g10/plaintext.c:722
#, c-format
msgid "can't open signed data '%s'\n"
-msgstr "klarte ikke å åpne signert data «%s»\n"
+msgstr ""
+#: g10/plaintext.c:757
#, c-format
msgid "can't open signed data fd=%d: %s\n"
-msgstr "klarte ikke å åpne signert data fd=%d: «%s»\n"
+msgstr ""
+#: g10/pubkey-enc.c:98 g10/pubkey-enc.c:139 sm/decrypt.c:493
#, c-format
msgid "key %s is not suitable for decryption in %s mode\n"
-msgstr "nøkkel %s egner seg ikke for dekryptering i %s-modus\n"
+msgstr ""
+#: g10/pubkey-enc.c:131
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
-msgstr "anonym mottaker. prøver hemmelig nøkkel %s …\n"
+msgstr ""
+#: g10/pubkey-enc.c:150
msgid "okay, we are the anonymous recipient.\n"
-msgstr "ok, det er du som er den anonyme mottakeren.\n"
+msgstr ""
+#: g10/pubkey-enc.c:310
msgid "old encoding of the DEK is not supported\n"
-msgstr "gammel DEK-koding støttes ikke\n"
+msgstr ""
+#: g10/pubkey-enc.c:338
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "krypteringsalgoritme %d%s er ukjent eller slått av\n"
+msgstr ""
+#: g10/pubkey-enc.c:382
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
-msgstr "ADVARSEL: fant ikke krypteringsalgoritme %s i mottakers oppsett\n"
+msgstr ""
+#: g10/pubkey-enc.c:415
#, c-format
msgid "Note: secret key %s expired at %s\n"
-msgstr "Merk: hemmelig nøkkel %s utgått %s\n"
+msgstr ""
+#: g10/pubkey-enc.c:422
msgid "Note: key has been revoked"
-msgstr "Merk: nøkkelen er opphevet"
+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 mislyktes: %s\n"
+msgstr ""
+#: g10/revoke.c:143
#, c-format
msgid "key %s has no user IDs\n"
-msgstr "nøkkel %s: ingen bruker-ID\n"
+msgstr ""
+#: g10/revoke.c:311
msgid "To be revoked by:\n"
-msgstr "Skal oppheves av:\n"
+msgstr ""
+#: g10/revoke.c:315
msgid "(This is a sensitive revocation key)\n"
-msgstr "(Dette er en privat opphevelsesnøkkel)\n"
+msgstr ""
+#: g10/revoke.c:321
msgid "Secret key is not available.\n"
-msgstr "Hemmelig nøkkel er ikke tilgjengelig.\n"
+msgstr ""
+#: g10/revoke.c:326
msgid "Create a designated revocation certificate for this key? (y/N) "
-msgstr "Vil du lage et utpekt opphevelsessertifikat for denne nøkkelen? (j/N) "
+msgstr ""
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
-msgstr "Tvunget ASCII-armert utdata.\n"
+msgstr ""
+#: g10/revoke.c:351 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
-msgstr "make_keysig_packet mislyktes: %s\n"
+msgstr ""
+#: g10/revoke.c:414
msgid "Revocation certificate created.\n"
-msgstr "Opphevelsessertifikat opprettet.\n"
+msgstr ""
+#: g10/revoke.c:420
#, c-format
msgid "no revocation keys found for \"%s\"\n"
-msgstr "fant ingen opphevelsesnøkler for «%s»\n"
+msgstr ""
- #: g10/revoke.c:552
++#: g10/revoke.c:565
msgid "This is a revocation certificate for the OpenPGP key:"
-msgstr "Dette er et opphevelsessertifikat for følgende OpenPGP-nøkkel:"
+msgstr ""
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
-"Et opphevelsessertifikat er en slags nødknapp som lar deg\n"
-"erklære offentlig at en nøkkel ikke skal brukes mer. Det er ikke mulig\n"
-"å trekke tilbake en oppheving straks den er blitt publisert."
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6114,42 -4961,44 +6109,42 @@@
"a reason for the revocation. For details see the description of\n"
"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
-"Bruk det for å oppheve denne nøkkelen hvis den blir kompromittert\n"
-"eller hvis du mister den hemmelige nøkkelen. Hvis du fremdeles har\n"
-"tilgang til den hemmelige nøkkelen, er det lurt å heller lage et nytt\n"
-"opphevelsessertifikat og oppgi en grunn til opphevelsen.\n"
-"Se beskrivelse av kommandoen «--generate-revocation» i GnuPG-\n"
-"bruksanvisninga for detaljer."
- #: g10/revoke.c:577
++#: g10/revoke.c:590
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 ""
-"Et kolontegn er satt inn før 5 streker nedenfor.\n"
-"Fjern dette kolonet med en tekstbehandler før du importerer og\n"
-"publiserer opphevelsessertifikatet."
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, c-format
msgid "revocation certificate stored as '%s.rev'\n"
-msgstr "opphevelsessertifikat lagret som «%s.rev»\n"
+msgstr ""
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, c-format
msgid "secret key \"%s\" not found\n"
-msgstr "fant ikke hemmelig nøkkel «%s»\n"
+msgstr ""
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
-msgstr "«%s» samsvarer med flere hemmelige nøkler:\n"
+msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, c-format
msgid "error searching the keyring: %s\n"
-msgstr "feil under søk på nøkkelknippe: %s\n"
+msgstr ""
- #: g10/revoke.c:717
++#: g10/revoke.c:730
msgid "Create a revocation certificate for this key? (y/N) "
-msgstr "Vil du lage et opphevelsessertifikat for denne nøkkelen? (j/N) "
+msgstr ""
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6159,42 -5008,44 +6154,42 @@@
"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 ""
-"Opphevelsessertifikat opprettet.\n"
-"\n"
-"Flytt dette til et medium du kan holde utenfor andres rekkevidde. Hvis "
-"Mallory\n"
-"får tak i dette sertifikatet, kan han bruke det til å gjøre nøkkelen din "
-"ubrukelig.\n"
-"Det er lurt å skrive ut dette sertifikatet fysisk og sette det på et lager i "
-"tilfelle\n"
-"datalagringsmediet blir uleselig. Men vær forsiktig. Datamaskinens\n"
-"utskriftssystem kan være satt opp til å lagre utskriftsdata og dermed gjøre\n"
-"det mulig for andre å lese sertifikatet.\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
-msgstr "Velg grunn for opphevelse:\n"
+msgstr ""
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
-msgstr "Avbryt"
+msgstr ""
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
-msgstr "(Normalt bør du velge %d her)\n"
+msgstr ""
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
-msgstr "Skriv inn en beskrivelse hvis du vil, og avslutt med tom linje:\n"
+msgstr ""
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
-msgstr "Grunnlag for opphevelse: %s\n"
+msgstr ""
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
-msgstr "(Ingen beskrivelse oppgitt)\n"
+msgstr ""
- #: g10/revoke.c:863
++#: g10/revoke.c:876
msgid "Is this okay? (y/N) "
-msgstr "Er dette i orden? (j/N) "
+msgstr ""
+#: g10/seskey.c:62 sm/encrypt.c:124
msgid "weak key created - retrying\n"
-msgstr "nøkkelen ble svak. Prøver på nytt\n"
+msgstr ""
+#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
@@@ -6355,249 -5193,197 +6350,249 @@@ msgid "
"# List of assigned trustvalues, created %s\n"
"# (Use \"gpg --import-ownertrust\" to restore them)\n"
msgstr ""
-"# Liste over tildelte tillitsverdier, opprettet %s\n"
-"# (Bruk «gpg --import-ownertrust» for å gjenopprette disse)\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 "feil i «%s»: %s\n"
+msgstr ""
+#: g10/tdbdump.c:162
msgid "line too long"
-msgstr "for lang linje"
+msgstr ""
+#: g10/tdbdump.c:170
msgid "colon missing"
-msgstr "kolon mangler"
+msgstr ""
+#: g10/tdbdump.c:176
msgid "invalid fingerprint"
-msgstr "ugyldig fingeravtrykk"
+msgstr ""
+#: g10/tdbdump.c:181
msgid "ownertrust value missing"
-msgstr "verdi for eiertillit mangler"
+msgstr ""
+#: g10/tdbdump.c:221
#, c-format
msgid "error finding trust record in '%s': %s\n"
-msgstr "feil under søk etter tillitspost i «%s»: %s\n"
+msgstr ""
+#: g10/tdbdump.c:225
#, c-format
msgid "read error in '%s': %s\n"
-msgstr "lesefeil i «%s»: %s\n"
+msgstr ""
+#: g10/tdbdump.c:234 g10/trustdb.c:384
#, c-format
msgid "trustdb: sync failed: %s\n"
-msgstr "trustdb: synk mislyktes: %s\n"
+msgstr ""
+#: g10/tdbio.c:141 sm/keydb.c:356
#, c-format
msgid "can't create lock for '%s'\n"
-msgstr "klarte ikke å lage lås for «%s»\n"
+msgstr ""
+#: g10/tdbio.c:146
#, c-format
msgid "can't lock '%s'\n"
-msgstr "klarte ikke å låse «%s»\n"
+msgstr ""
+#: g10/tdbio.c:205 g10/tdbio.c:1789
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
-msgstr "trustdb-oppf. %lu: lseek mislyktes: %s\n"
+msgstr ""
+#: g10/tdbio.c:213 g10/tdbio.c:1800
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
-msgstr "trustdb-oppf. %lu: skriving mislyktes (n=%d): %s\n"
+msgstr ""
+#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
-msgstr "trustdb-transaksjon er for stor\n"
+msgstr ""
+#: g10/tdbio.c:683
#, c-format
msgid "%s: directory does not exist!\n"
-msgstr "%s: mappa finnes ikke.\n"
+msgstr ""
+#: 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"
+msgstr ""
+#: g10/tdbio.c:725
#, c-format
msgid "%s: failed to create version record: %s"
-msgstr "%s: klarte ikke å lage versjonsoppføring: %s"
+msgstr ""
+#: g10/tdbio.c:730
#, c-format
msgid "%s: invalid trustdb created\n"
-msgstr "%s: laget ugyldig trustdb\n"
+msgstr ""
+#: g10/tdbio.c:733
#, c-format
msgid "%s: trustdb created\n"
-msgstr "%s: trustdb opprettet\n"
+msgstr ""
+#: g10/tdbio.c:789
msgid "Note: trustdb not writable\n"
-msgstr "Merk: trustdb er ikke skrivbar\n"
+msgstr ""
+#: g10/tdbio.c:798
#, c-format
msgid "%s: invalid trustdb\n"
-msgstr "%s: ugyldig trustdb\n"
+msgstr ""
+#: g10/tdbio.c:835
#, c-format
msgid "%s: failed to create hashtable: %s\n"
-msgstr "%s: klarte ikke å lage kontrollsum-tabell: %s\n"
+msgstr ""
+#: g10/tdbio.c:843
#, c-format
msgid "%s: error updating version record: %s\n"
-msgstr "%s: feil under oppdatering av versjonsoppføring: %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: feil under lesing av versjonsoppføring: %s\n"
+msgstr ""
+#: g10/tdbio.c:939
#, c-format
msgid "%s: error writing version record: %s\n"
-msgstr "%s: feil under skriving av versjonsoppføring: %s\n"
+msgstr ""
+#: g10/tdbio.c:1463
#, c-format
msgid "trustdb: lseek failed: %s\n"
-msgstr "trustdb: lseek mislyktes: %s\n"
+msgstr ""
+#: g10/tdbio.c:1474
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
-msgstr "trustdb: lesing mislyktes (n=%d): %s\n"
+msgstr ""
+#: g10/tdbio.c:1499
#, c-format
msgid "%s: not a trustdb file\n"
-msgstr "%s: ikke en trustdb-fil\n"
+msgstr ""
+#: g10/tdbio.c:1524
#, c-format
msgid "%s: version record with recnum %lu\n"
-msgstr "%s: versjonsoppføring nr. %lu\n"
+msgstr ""
+#: g10/tdbio.c:1530
#, c-format
msgid "%s: invalid file version %d\n"
-msgstr "%s: %d er en ugyldig filversjon\n"
+msgstr ""
+#: g10/tdbio.c:1750
#, c-format
msgid "%s: error reading free record: %s\n"
-msgstr "%s: feil under lesing av «free»-oppføring: %s\n"
+msgstr ""
+#: g10/tdbio.c:1759
#, c-format
msgid "%s: error writing dir record: %s\n"
-msgstr "%s: feil under skriving av «dir»-oppføring: %s\n"
+msgstr ""
+#: g10/tdbio.c:1770
#, c-format
msgid "%s: failed to zero a record: %s\n"
-msgstr "%s: klarte ikke å nullstille oppføring: %s\n"
+msgstr ""
+#: g10/tdbio.c:1806
#, c-format
msgid "%s: failed to append a record: %s\n"
-msgstr "%s: klarte ikke å legge til oppføring: %s\n"
+msgstr ""
+#: g10/tdbio.c:1867
msgid "Error: The trustdb is corrupted.\n"
-msgstr "Error: trustdb er skadet.\n"
+msgstr ""
+#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
-msgstr "tekstlinjer som er lengre enn %d tegn kan ikke behandles\n"
+msgstr ""
+#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
-msgstr "inndata-linje er lengre enn %d tegn\n"
+msgstr ""
+#: 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"
+msgstr ""
+#: 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"
+msgstr ""
+#: 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"
+msgstr ""
+#: g10/tofu.c:504
#, c-format
msgid "unsupported TOFU database version: %s\n"
-msgstr "TOFU-databaseversjon støttes ikke: %s\n"
+msgstr ""
+#: g10/tofu.c:537
#, c-format
msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
-msgstr "feil under oppretting av TOFU-tabell «ultimately_trusted_keys»: %s\n"
+msgstr ""
+#: 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-feil"
+msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, c-format
msgid "error reading TOFU database: %s\n"
-msgstr "feil under lesing av TOFU-database: %s\n"
+msgstr ""
+#: 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"
+msgstr ""
+#: 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"
+msgstr ""
+#: g10/tofu.c:843
#, c-format
msgid "error creating 'encryptions' TOFU table: %s\n"
-msgstr "feil under oppretting av TOFU-tabell «encryptions»: %s\n"
+msgstr ""
+#: g10/tofu.c:873
#, c-format
msgid "adding column effective_policy to bindings DB: %s\n"
-msgstr "legger til kolonne «effective_policy» i tilknytningsdatabase: %s\n"
+msgstr ""
+#: g10/tofu.c:955
#, c-format
msgid "error opening TOFU database '%s': %s\n"
-msgstr "feil under åpning av TOFU-database «%s»: %s\n"
+msgstr ""
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, c-format
msgid "error updating TOFU database: %s\n"
-msgstr "feil under oppdatering av TOFU-database: %s\n"
+msgstr ""
+#: g10/tofu.c:1327
#, c-format
msgid ""
"This is the first time the email address \"%s\" is being used with key %s."
@@@ -6892,139 -5637,127 +6887,139 @@@ msgid_plural "
" %s\n"
"to mark it as being bad.\n"
msgstr[0] ""
-"Warning: hvis du tror du har sett flere signaturer fra denne nøkkelen og "
-"bruker-id-en, kan det bety at nøkkelen er forfalsket. Kontroller e-"
-"postadressen nøye og se etter små variasjoner. Hvis noe ser galt ut, bør du "
-"bruke\n"
-" %s\n"
-"for å markere den som upålitelig.\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: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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, c-format
msgid "error opening TOFU database: %s\n"
-msgstr "feil under åpning av TOFU-database: %s\n"
+msgstr ""
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
-"ADVARSEL: krypterer til %s. Denne har ingen bruker-id-er som ikke er "
-"opphevet\n"
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, c-format
msgid "error setting policy for key %s, user id \"%s\": %s"
-msgstr "feil under endring av regel for nøkkel %s, bruker-id «%s»: %s"
+msgstr ""
+#: g10/trustdb.c:216
#, c-format
msgid "'%s' is not a valid long keyID\n"
-msgstr "«%s» er en ugyldig lang nøkkel-ID\n"
+msgstr ""
+#: g10/trustdb.c:242
#, c-format
msgid "key %s: accepted as trusted key\n"
-msgstr "nøkkel %s: godtatt som betrodd nøkkel\n"
+msgstr ""
+#: g10/trustdb.c:280
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
-msgstr "nøkkel %s forekommer flere enn én gang i trustdb\n"
+msgstr ""
+#: g10/trustdb.c:295
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
-msgstr "nøkkel %s: ingen offentlig nøkkel for betrodd nøkkel - hoppet over\n"
+msgstr ""
+#: g10/trustdb.c:305
#, c-format
msgid "key %s marked as ultimately trusted\n"
-msgstr "nøkkel %s markert som endelig betrodd.\n"
+msgstr ""
+#: g10/trustdb.c:348
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "tillitsoppføring %lu, foresp.type %d: lesing mislyktes: %s\n"
+msgstr ""
+#: g10/trustdb.c:354
#, c-format
msgid "trust record %lu is not of requested type %d\n"
-msgstr "tillitsoppføring %lu er ikke av forespurt type (%d)\n"
+msgstr ""
+#: g10/trustdb.c:429
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
-"Du kan prøve å gjenskape trustdb ved å skrive inn følgende kommandoer:\n"
+#: g10/trustdb.c:438
msgid "If that does not work, please consult the manual\n"
-msgstr "Se bruksanvisning hvis dette ikke hjelper\n"
+msgstr ""
+#: g10/trustdb.c:488
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
-"Klarte ikke å bruke ukjent tillitsmodell (%d). Prøver tillitsmodell %s\n"
+#: g10/trustdb.c:494
#, c-format
msgid "using %s trust model\n"
-msgstr "bruker tillitsmodell %s\n"
+msgstr ""
+#: g10/trustdb.c:543
msgid "no need for a trustdb check\n"
-msgstr "kontroll av trustdb er ikke nødvendig\n"
+msgstr ""
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
-msgstr "neste kontroll av trustdb planlagt %s\n"
+msgstr ""
+#: g10/trustdb.c:558
#, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
-msgstr "trustdb behøver ikke kontroll ved bruk av tillitsmodell «%s»\n"
+msgstr ""
+#: g10/trustdb.c:574
#, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
-msgstr "trustdb behøver ikke oppdatering ved bruk av tillitsmodell «%s»\n"
+msgstr ""
+#: g10/trustdb.c:798 g10/trustdb.c:1385
#, c-format
msgid "public key %s not found: %s\n"
-msgstr "fant ikke offentlig nøkkel %s: %s\n"
+msgstr ""
+#: g10/trustdb.c:1018
msgid "please do a --check-trustdb\n"
-msgstr "kjør «--check-trustdb»\n"
+msgstr ""
+#: g10/trustdb.c:1023
msgid "checking the trustdb\n"
-msgstr "kontrollerer trustdb\n"
+msgstr ""
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
-msgstr[0] "%d nøkkel behandlet"
-msgstr[1] "%d nøkler behandlet"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, c-format
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
-msgstr[0] "(%d gyldighetsantall klarert)\n"
-msgstr[1] "(%d gyldighetsantall klarert)\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
-msgstr "fant ingen nøkler med absolutt («ultimat») pålitelighet\n"
+msgstr ""
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
-msgstr "fant ikke offentlig nøkkel for absolutt pålitelig nøkkel %s\n"
+msgstr ""
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
-"dybde: %d gyldig: %3d signert: %3d tillit: %d-, %dq, %dn, %dm, %df, %du\n"
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -7420,343 -6077,264 +7415,343 @@@ 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|Ny PIN"
+msgstr ""
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
-msgstr "kjør i multi-tjenermodus (forgrunn)"
+msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr "|NIVÅ|endre feilsøkingsnivå til valgt NIVÅ"
+msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
msgid "|FILE|write a log to FILE"
-msgstr "|FIL|skriv logg til valgt FIL"
+msgstr ""
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
-msgstr "|N|koble til leser via port N"
+msgstr ""
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
msgid "|NAME|use NAME as ct-API driver"
-msgstr "|NAVN|bruk valgt NAVN som ct-API-driver"
+msgstr ""
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
msgid "|NAME|use NAME as PC/SC driver"
-msgstr "|NAME|bruk valgt NAVN som PC-/SC-driver"
+msgstr ""
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
msgid "do not use the internal CCID driver"
-msgstr "ikke bruk intern CCID-driver"
+msgstr ""
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
-msgstr "|N|koble fra kort etter N antall sekunder uten aktivitet"
+msgstr ""
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
-msgstr "ikke bruk kodetastatur"
+msgstr ""
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
msgid "deny the use of admin card commands"
-msgstr "avvis bruk av admin-kortkommandoer"
+msgstr ""
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
-msgstr "bruk inndata av vairabel lengde for kodetastatur"
+msgstr ""
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
-msgstr "Bruk: @SCDAEMON@ [valg] (-h for hjelp)"
+msgstr ""
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
-"Syntaks: scdaemon [valg] [kommando [arg]]\n"
-"Smartcard-bakgrunnsprogram for @GNUPG@\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
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"
+msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
-msgstr "startet håndteringsprogram for fd %d\n"
+msgstr ""
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
-msgstr "avsluttet håndteringsprogram for fd %d\n"
+msgstr ""
+#: sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2245
msgid "no dirmngr running in this session\n"
-msgstr "ingen dirmngr kjører i gjeldende økt\n"
+msgstr ""
+#: sm/certchain.c:194
#, c-format
msgid "validation model requested by certificate: %s"
-msgstr "kontrollmodell forespurt av sertifikat: %s"
+msgstr ""
+#: sm/certchain.c:195 sm/certchain.c:1937
msgid "chain"
-msgstr "kjede"
+msgstr ""
+#: sm/certchain.c:196 sm/certchain.c:1937
msgid "shell"
-msgstr "skall"
+msgstr ""
+#: sm/certchain.c:256 dirmngr/validate.c:144
#, c-format
msgid "critical certificate extension %s is not supported"
-msgstr "kritisk sertifikatutvidelse %s støttes ikke"
+msgstr ""
+#: sm/certchain.c:295 dirmngr/validate.c:242
msgid "issuer certificate is not marked as a CA"
-msgstr "utsteders sertifikat er ikke merket som CA"
+msgstr ""
+#: sm/certchain.c:333
msgid "critical marked policy without configured policies"
-msgstr "regelsett merket som kritisk uten oppsatte regler"
+msgstr ""
+#: sm/certchain.c:343
#, c-format
msgid "failed to open '%s': %s\n"
-msgstr "klarte ikke å åpne «%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 "Merk: ukritisk sertifikat-regelsett er ikke tillatt"
+msgstr ""
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:209
msgid "certificate policy not allowed"
-msgstr "sertifikatregelverk tillates ikke"
+msgstr ""
+#: sm/certchain.c:538
msgid "looking up issuer at external location\n"
-msgstr "slår opp utsteder på ekstern plassering\n"
+msgstr ""
+#: sm/certchain.c:558
#, c-format
msgid "number of issuers matching: %d\n"
-msgstr "antall ustedere funnet: %d\n"
+msgstr ""
+#: sm/certchain.c:606
msgid "looking up issuer from the Dirmngr cache\n"
-msgstr "slår opp utsteder fra Dirmngr-hurtiglager\n"
+msgstr ""
+#: sm/certchain.c:631
#, c-format
msgid "number of matching certificates: %d\n"
-msgstr "antall treff på sertifikater: %d\n"
+msgstr ""
+#: sm/certchain.c:634
#, c-format
msgid "dirmngr cache-only key lookup failed: %s\n"
-msgstr "nøkkeloppslag i dirmngr-hurtiglager mislyktes: %s\n"
+msgstr ""
+#: 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"
+msgstr ""
+#: sm/certchain.c:999
msgid "certificate has been revoked"
-msgstr "sertifikatet er opphevet"
+msgstr ""
+#: sm/certchain.c:1014
msgid "the status of the certificate is unknown"
-msgstr "sertifikatet har ukjent status"
+msgstr ""
+#: sm/certchain.c:1021
msgid "please make sure that the \"dirmngr\" is properly installed\n"
-msgstr "kontroller at «dirmngr» er installert skikkelig\n"
+msgstr ""
+#: sm/certchain.c:1027
#, c-format
msgid "checking the CRL failed: %s"
-msgstr "kontroll av CRL mislyktes: %s"
+msgstr ""
+#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
#, c-format
msgid "certificate with invalid validity: %s"
-msgstr "sertifikat med ugyldig gyldighetsverdi: %s"
+msgstr ""
+#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
msgid "certificate not yet valid"
-msgstr "sertifikatet er ikke gyldig enda"
+msgstr ""
+#: sm/certchain.c:1072 sm/certchain.c:1157
msgid "root certificate not yet valid"
-msgstr "rotsertifikat er ikke gyldig enda"
+msgstr ""
+#: sm/certchain.c:1073 sm/certchain.c:1158
msgid "intermediate certificate not yet valid"
-msgstr "mellomsertifikat er ikke gyldig enda"
+msgstr ""
+#: sm/certchain.c:1086 dirmngr/validate.c:526
msgid "certificate has expired"
-msgstr "sertifikatet er utgått"
+msgstr ""
+#: sm/certchain.c:1087
msgid "root certificate has expired"
-msgstr "rotsertifikat er utgått"
+msgstr ""
+#: sm/certchain.c:1088
msgid "intermediate certificate has expired"
-msgstr "mellomsertifikat er utgått"
+msgstr ""
+#: sm/certchain.c:1130
#, c-format
msgid "required certificate attributes missing: %s%s%s"
-msgstr "påkrevde sertifikategenskaper mangler: %s%s%s"
+msgstr ""
+#: sm/certchain.c:1139
msgid "certificate with invalid validity"
-msgstr "sertifikat med ugyldig gyldighetsverdi"
+msgstr ""
+#: sm/certchain.c:1176
msgid "signature not created during lifetime of certificate"
-msgstr "signatur ikke laget innenfor sertifikatets levetid"
+msgstr ""
+#: sm/certchain.c:1178
msgid "certificate not created during lifetime of issuer"
-msgstr "sertifikat ikke laget innenfor utsteders levetid"
+msgstr ""
+#: sm/certchain.c:1179
msgid "intermediate certificate not created during lifetime of issuer"
-msgstr "mellomsertifikat ikke laget innenfor utsteders levetid"
+msgstr ""
+#: sm/certchain.c:1183
msgid " ( signature created at "
-msgstr " ( signatur opprettet "
+msgstr ""
+#: sm/certchain.c:1184
msgid " (certificate created at "
-msgstr " (sertifikat opprettet "
+msgstr ""
+#: sm/certchain.c:1187
msgid " (certificate valid from "
-msgstr " (sertifikat gyldig fra "
+msgstr ""
+#: sm/certchain.c:1188
msgid " ( issuer valid from "
-msgstr " ( utsteder gyldig fra "
+msgstr ""
+#: sm/certchain.c:1218 dirmngr/validate.c:577
#, c-format
msgid "fingerprint=%s\n"
-msgstr "fingeravtrykk=%s\n"
+msgstr ""
+#: sm/certchain.c:1227
msgid "root certificate has now been marked as trusted\n"
-msgstr "rotsertifikat er nå merket som troverdig\n"
+msgstr ""
+#: sm/certchain.c:1240
msgid "interactive marking as trusted not enabled in gpg-agent\n"
-msgstr "interaktiv tillitsmerking er ikke slått på i gpg-agent\n"
+msgstr ""
+#: sm/certchain.c:1246
msgid "interactive marking as trusted disabled for this session\n"
-msgstr "interaktiv tillitsmarkering er slått av for gjeldende økt\n"
+msgstr ""
+#: sm/certchain.c:1304
msgid "WARNING: creation time of signature not known - assuming current time"
msgstr ""
-"ADVARSEL: opprettelsestid for signatur er ukjent. Antar gjeldende tidspunkt"
+#: sm/certchain.c:1368
msgid "no issuer found in certificate"
-msgstr "fant ingen utsteder i sertifikat"
+msgstr ""
+#: sm/certchain.c:1446
msgid "self-signed certificate has a BAD signature"
-msgstr "selvsignert sertifikat har ugyldig signatur"
+msgstr ""
+#: sm/certchain.c:1515 dirmngr/validate.c:575
msgid "root certificate is not marked trusted"
-msgstr "rotsertifikat er ikke merket som troverdig"
+msgstr ""
+#: sm/certchain.c:1531
#, c-format
msgid "checking the trust list failed: %s\n"
-msgstr "kontroll av tillitsliste mislyktes: %s\n"
+msgstr ""
+#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
msgid "certificate chain too long\n"
-msgstr "sertifikatkjede er for langt\n"
+msgstr ""
+#: sm/certchain.c:1574 dirmngr/validate.c:642
msgid "issuer certificate not found"
-msgstr "fant ikke utstedersertifikat"
+msgstr ""
+#: sm/certchain.c:1607 dirmngr/validate.c:668
msgid "certificate has a BAD signature"
-msgstr "sertifikatet har ugyldig signatur"
+msgstr ""
+#: sm/certchain.c:1639 dirmngr/validate.c:692
msgid "found another possible matching CA certificate - trying again"
-msgstr "fant et annet CA-sertifikat som kan fungere. Prøver igjen"
+msgstr ""
+#: sm/certchain.c:1698 dirmngr/validate.c:717
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
-msgstr "sertifikatkjede er lengre enn CA tillater (%d)"
+msgstr ""
+#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
msgid "certificate is good\n"
-msgstr "sertifikatet er gyldig\n"
+msgstr ""
+#: sm/certchain.c:1741
msgid "intermediate certificate is good\n"
-msgstr "mellomsertifikat er ok\n"
+msgstr ""
+#: sm/certchain.c:1742
msgid "root certificate is good\n"
-msgstr "rotsertifikat er gyldig\n"
+msgstr ""
+#: sm/certchain.c:1924
msgid "switching to chain model"
-msgstr "bytter til kjedemodell"
+msgstr ""
+#: sm/certchain.c:1933
#, c-format
msgid "validation model used: %s"
-msgstr "gyldighetsmodell: %s"
+msgstr ""
+#: sm/certcheck.c:107
#, c-format
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"
+msgstr ""
+#: sm/certcheck.c:244 sm/verify.c:210
msgid "(this is the MD2 algorithm)\n"
-msgstr "(dette er algortime MD2)\n"
+msgstr ""
+#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:707
msgid "none"
-msgstr "ingen"
+msgstr ""
+#: sm/certdump.c:552 sm/certdump.c:617
msgid "[Error - invalid encoding]"
-msgstr "[Feil - utgyldig koding]"
+msgstr ""
+#: sm/certdump.c:560
msgid "[Error - out of core]"
-msgstr "[feil - kjernen er full]"
+msgstr ""
+#: sm/certdump.c:596
msgid "[Error - No name]"
-msgstr "[feil - ingen navn]"
+msgstr ""
+#: sm/certdump.c:623
msgid "[Error - invalid DN]"
-msgstr "[feil - ugyldig DN]"
+msgstr ""
+#: sm/certdump.c:833
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@@ -7962,346 -6508,272 +7957,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 "Emnenavnet «%s» er ugyldig\n"
+msgstr ""
+#: sm/certreqgen-ui.c:322
msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
-msgstr "12"
+msgstr ""
+#: sm/certreqgen-ui.c:334
msgid "Enter email addresses"
-msgstr "Skriv inn e-postadresser"
+msgstr ""
+#: sm/certreqgen-ui.c:335
msgid " (end with an empty line):\n"
-msgstr " (avslutt med tom linje):\n"
+msgstr ""
+#: sm/certreqgen-ui.c:339
msgid "Enter DNS names"
-msgstr "Skriv inn DNS-navn"
+msgstr ""
+#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
msgid " (optional; end with an empty line):\n"
-msgstr " (valgfritt. Avslutt med tom linje):\n"
+msgstr ""
+#: sm/certreqgen-ui.c:344
msgid "Enter URIs"
-msgstr "Skriv inn adresser"
+msgstr ""
+#: sm/certreqgen-ui.c:351
msgid "Create self-signed certificate? (y/N) "
-msgstr "Vil du lage selvsignert sertifikat? (y/N) "
+msgstr ""
+#: sm/certreqgen-ui.c:378
msgid "These parameters are used:\n"
-msgstr "Følgende parametre brukes:\n"
+msgstr ""
+#: sm/certreqgen-ui.c:396
msgid "Now creating self-signed certificate. "
-msgstr "Lager selvsignert sertifikat."
+msgstr ""
+#: sm/certreqgen-ui.c:398
msgid "Now creating certificate request. "
-msgstr "Lager sertifikatforespørsel. "
+msgstr ""
+#: sm/certreqgen-ui.c:399
msgid "This may take a while ...\n"
-msgstr "Dette kan ta en stund …\n"
+msgstr ""
+#: sm/certreqgen-ui.c:410
msgid "Ready.\n"
-msgstr "Ferdig.\n"
+msgstr ""
+#: sm/certreqgen-ui.c:413
msgid "Ready. You should now send this request to your CA.\n"
msgstr ""
-"Ferdig. Du kan nå sende denne forespørselen til aktuell sertifikatutsteder "
-"(CA).\n"
+#: sm/certreqgen-ui.c:419
msgid "resource problem: out of core\n"
-msgstr "ressursproblem: oppbrukt kjerne\n"
+msgstr ""
+#: sm/decrypt.c:341
msgid "(this is the RC2 algorithm)\n"
-msgstr "(dette er algoritme RC2)\n"
+msgstr ""
+#: 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"
+msgstr ""
+#: sm/delete.c:51 sm/delete.c:112
#, c-format
msgid "certificate '%s' not found: %s\n"
-msgstr "fant ikke sertifikatet «%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 "feil under låsing av nøkkelskrin: %s\n"
+msgstr ""
+#: sm/delete.c:143
#, c-format
msgid "duplicated certificate '%s' deleted\n"
-msgstr "duplikatsertifikat «%s» slettet\n"
+msgstr ""
+#: sm/delete.c:145
#, c-format
msgid "certificate '%s' deleted\n"
-msgstr "sertifikat «%s» slettet\n"
+msgstr ""
+#: sm/delete.c:175
#, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
-msgstr "sletting av sertifikat «%s» mislyktes: %s\n"
+msgstr ""
+#: sm/encrypt.c:330
msgid "no valid recipients given\n"
-msgstr "ingen gyldige mottakere valgt\n"
+msgstr ""
+#: sm/gpgsm.c:210
msgid "list external keys"
-msgstr "vis eksterne nøkler"
+msgstr ""
+#: sm/gpgsm.c:212
msgid "list certificate chain"
-msgstr "vis sertifikatkjede "
+msgstr ""
+#: sm/gpgsm.c:220
msgid "import certificates"
-msgstr "importer sertifikater"
+msgstr ""
+#: sm/gpgsm.c:221
msgid "export certificates"
-msgstr "eksporter sertifikater"
+msgstr ""
+#: sm/gpgsm.c:229
msgid "register a smartcard"
-msgstr "registrer smartkort"
+msgstr ""
+#: sm/gpgsm.c:232
msgid "pass a command to the dirmngr"
-msgstr "send en kommando til dirmngr"
+msgstr ""
+#: sm/gpgsm.c:234
msgid "invoke gpg-protect-tool"
-msgstr "kall gpg-protect-tool"
+msgstr ""
+#: sm/gpgsm.c:251
msgid "create base-64 encoded output"
-msgstr "lag base64-kodet utdata"
+msgstr ""
+#: sm/gpgsm.c:259
msgid "assume input is in PEM format"
-msgstr "forvent inndata i «PEM»-format"
+msgstr ""
+#: sm/gpgsm.c:261
msgid "assume input is in base-64 format"
-msgstr "forvent inndata i «base-64»-format"
+msgstr ""
+#: sm/gpgsm.c:263
msgid "assume input is in binary format"
-msgstr "forvent inndata i binærformat"
+msgstr ""
+#: sm/gpgsm.c:270
msgid "never consult a CRL"
-msgstr "aldri spør CRL"
+msgstr ""
+#: sm/gpgsm.c:280
msgid "check validity using OCSP"
-msgstr "kontroller gyldighet med OCSP"
+msgstr ""
+#: sm/gpgsm.c:285
msgid "|N|number of certificates to include"
-msgstr "|N|antall sertifikater som skal være med"
+msgstr ""
+#: sm/gpgsm.c:288
msgid "|FILE|take policy information from FILE"
-msgstr "|FIL|hent regler fra valgt FIL"
+msgstr ""
+#: sm/gpgsm.c:291
msgid "do not check certificate policies"
-msgstr "ikke kontroller sertifikatregler"
+msgstr ""
+#: sm/gpgsm.c:295
msgid "fetch missing issuer certificates"
-msgstr "hent manglende utstedersertifikat"
+msgstr ""
+#: sm/gpgsm.c:306
msgid "don't use the terminal at all"
-msgstr "ikke bruk terminal i det hele tatt"
+msgstr ""
+#: sm/gpgsm.c:308
msgid "|FILE|write a server mode log to FILE"
-msgstr "|FIL|lagre en tjenermodus-logg i valgt FIL"
+msgstr ""
+#: sm/gpgsm.c:313
msgid "|FILE|write an audit log to FILE"
-msgstr "|FIL|lagre en revisjonslogg i valgt FIL"
+msgstr ""
+#: sm/gpgsm.c:316
msgid "batch mode: never ask"
-msgstr "buntmodus: aldri spør"
+msgstr ""
+#: sm/gpgsm.c:317
msgid "assume yes on most questions"
-msgstr "svar automatisk ja på de fleste spørsmål"
+msgstr ""
+#: sm/gpgsm.c:318
msgid "assume no on most questions"
-msgstr "svar automatisk nei på de fleste spørsmål"
+msgstr ""
+#: sm/gpgsm.c:321
msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|FIL|legg til nøkkelknippe i liste over nøkkelknipper"
+msgstr ""
+#: 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"
+msgstr ""
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|SPEC|bruk valgt nøkkeltjener til å slå opp nøkler"
+msgstr ""
+#: sm/gpgsm.c:351
msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAVN|bruk valgt krypteringsalgoritme-NAVN"
+msgstr ""
+#: sm/gpgsm.c:353
msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAVN|bruk valgt summeringsalgoritme-NAVN for melding"
+msgstr ""
+#: sm/gpgsm.c:560
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
-msgstr "Bruk: @GPGSM@ [valg] [filer] (-h for hjelp)"
+msgstr ""
+#: 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 ""
-"Syntaks: gpg [valg] [filer]\n"
-"Signer, kontroller, krypter eller dekrypter.\n"
-"Forvalgt handling avhenger av inndata.\n"
+#: 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"
+msgstr ""
+#: sm/gpgsm.c:778
#, c-format
msgid "unknown validation model '%s'\n"
-msgstr "«%s» er en ukjent kontrollmodell\n"
+msgstr ""
+#: sm/gpgsm.c:829 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
-msgstr "%s:%u: vertsnavn mangler\n"
+msgstr ""
+#: 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"
+msgstr ""
+#: 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"
+msgstr ""
+#: sm/gpgsm.c:1431
msgid "could not parse keyserver\n"
-msgstr "klarte ikke å tolke nøkkeltjener\n"
+msgstr ""
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, c-format
msgid "importing common certificates '%s'\n"
-msgstr "importerer sertifikat «%s»\n"
+msgstr ""
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, c-format
msgid "can't sign using '%s': %s\n"
-msgstr "klarte ikke å signere med «%s»: %s\n"
+msgstr ""
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
-msgstr "ugyldig kommando (implisitt kommando finnes ikke)\n"
+msgstr ""
+#: sm/import.c:127
#, c-format
msgid "total number processed: %lu\n"
-msgstr "totalt antall behandlet: %lu\n"
+msgstr ""
+#: sm/import.c:246
msgid "error storing certificate\n"
-msgstr "feil under lagring av sertifikat\n"
+msgstr ""
+#: sm/import.c:254
msgid "basic certificate checks failed - not imported\n"
-msgstr "enkel sertifikatkontroll mislyktes. Ikke importert\n"
+msgstr ""
+#: sm/import.c:472 sm/keydb.c:1249 sm/keydb.c:1339
#, c-format
msgid "error getting stored flags: %s\n"
-msgstr "feil under henting av lagrede valg: %s\n"
+msgstr ""
+#: sm/import.c:531 sm/import.c:563
#, c-format
msgid "error importing certificate: %s\n"
-msgstr "feil under importering av sertifikat: %s\n"
+msgstr ""
+#: sm/import.c:751 tools/gpg-connect-agent.c:1433
#, c-format
msgid "error reading input: %s\n"
-msgstr "feil under lesing av inndata: %s\n"
+msgstr ""
+#: sm/keydb.c:1126 sm/keydb.c:1212
msgid "failed to get the fingerprint\n"
-msgstr "klarte ikke å hente fingeravtrykk\n"
+msgstr ""
+#: sm/keydb.c:1168
#, c-format
msgid "problem looking for existing certificate: %s\n"
-msgstr "klarte ikke å søke etter sertifikat: %s\n"
+msgstr ""
+#: sm/keydb.c:1180
#, c-format
msgid "error finding writable keyDB: %s\n"
-msgstr "feil under søk etter skrivbar nøkkeldatabase: %s\n"
+msgstr ""
+#: sm/keydb.c:1188
#, c-format
msgid "error storing certificate: %s\n"
-msgstr "feil under lagring av sertifikat: %s\n"
+msgstr ""
+#: sm/keydb.c:1240
#, c-format
msgid "problem re-searching certificate: %s\n"
-msgstr "det oppstod en feil under nytt søk etter sertifikat: %s\n"
+msgstr ""
+#: sm/keydb.c:1261 sm/keydb.c:1350
#, c-format
msgid "error storing flags: %s\n"
-msgstr "feil under lagring av valg: %s\n"
+msgstr ""
+#: sm/keylist.c:669
msgid "Error - "
-msgstr "Feil - "
+msgstr ""
+#: sm/misc.c:58
msgid "GPG_TTY has not been set - using maybe bogus default\n"
-msgstr "GPG_TTY har ingen verdi. Bruker forvalgt verdi som kan være ugyldig\n"
+msgstr ""
+#: sm/qualified.c:105
#, c-format
msgid "invalid formatted fingerprint in '%s', line %d\n"
-msgstr "feilformatert fingeravtrykk i «%s», linje %d\n"
+msgstr ""
+#: sm/qualified.c:123
#, c-format
msgid "invalid country code in '%s', line %d\n"
-msgstr "ugyldig landskode i «%s», linje %d\n"
+msgstr ""
+#: sm/qualified.c:206
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@@ -9050,1161 -7388,910 +9045,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 ""
-"Syntaks: dirmngr-client [valg] [sert-fil|mønster]\n"
-"Kontroller X.509-sertifikat mot CRL eller utfør OCSP-kontroll.\n"
-"Avslutningskode er 0 hvis sertifikatet er gyldig, 1 hvis\n"
-"ugyldig og annet for generelle programfeil\n"
+#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
#, c-format
msgid "error reading certificate from stdin: %s\n"
-msgstr "feil under lesing av sertifikat fra stdin: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:281
#, c-format
msgid "error reading certificate from '%s': %s\n"
-msgstr "feil under lesing av sertifikat fra «%s»: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
-msgstr "sertifikatet er for stort til at det gir mening\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:310
#, c-format
msgid "can't connect to the dirmngr: %s\n"
-msgstr "klarte ikke å koble til dirmngr: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:332
#, c-format
msgid "lookup failed: %s\n"
-msgstr "oppslag mislyktes: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:347
#, c-format
msgid "loading CRL '%s' failed: %s\n"
-msgstr "innlasting av CRL «%s» mislyktes: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:375
msgid "a dirmngr daemon is up and running\n"
-msgstr "dirmngr kjører i bakgrunnen\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:397
#, c-format
msgid "validation of certificate failed: %s\n"
-msgstr "kontroll av sertifikat mislyktes: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
msgid "certificate is valid\n"
-msgstr "sertifikatet er gyldig\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
msgid "certificate has been revoked\n"
-msgstr "sertifikatet er opphevet\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
#, c-format
msgid "certificate check failed: %s\n"
-msgstr "sertifikatkontroll mislyktes: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:428
#, c-format
msgid "got status: '%s'\n"
-msgstr "fikk status: «%s»\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:443
#, c-format
msgid "error writing base64 encoding: %s\n"
-msgstr "feil under skriving av base64-koding: %s\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:701
#, c-format
msgid "unsupported inquiry '%s'\n"
-msgstr "spørringa «%s» støttes ikke\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:803
msgid "absolute file name expected\n"
-msgstr "forventet fullstendig filsti\n"
+msgstr ""
+#: dirmngr/dirmngr-client.c:848
#, c-format
msgid "looking up '%s'\n"
-msgstr "slår opp «%s»\n"
+msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
-msgstr "vis innhold i CRL-hurtiglager"
+msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
msgid "|FILE|load CRL from FILE into cache"
-msgstr "|FIL|last inn CRL fra valgt FIL i hurtiglager"
+msgstr ""
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
-msgstr "|ADR|hent CRL fra valgt nettADResse"
+msgstr ""
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
-msgstr "slå av dirmngr"
+msgstr ""
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
-msgstr "tøm hurtiglager"
+msgstr ""
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
-msgstr "|FIL|skriv tjenermodus-logger til valgt FIL"
+msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
msgid "run without asking a user"
-msgstr "kjør uten å spørre bruker"
+msgstr ""
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
-msgstr "tving innlasting av utdatert CRL"
+msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
-msgstr "tillat sending av OCSP-forespørsler"
+msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
-msgstr "tillat kontroll av programvare-versjon over nett"
+msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
-msgstr "hindre bruk av HTTP"
+msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
-msgstr "hindre bruk av LDAP"
+msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
-msgstr "ignorer HTTP CRL-distribusjonspunkter"
+msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
-msgstr "ignorer LDAP CRL-distribusjonspunkter"
+msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
-msgstr "ignorer OSCP-tjenesteadresser som følger sertifikater"
+msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
-msgstr "|ADR|videresend alle HTTP-forespørsler til valgt nettADResse"
+msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
-msgstr "|VERT|bruk valgt VERT til LDAP-oppslag"
+msgstr ""
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
-msgstr "ikke bruk tilbakefallsverter ved bruk av valget «--ldap-proxy»"
+msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
msgid "|FILE|read LDAP server list from FILE"
-msgstr "|FIL|les LDAP-tjenerliste fra valgt FIL"
+msgstr ""
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
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:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
-msgstr "|N|endre LDAP-tidsavbrudd til N antall sekunder"
+msgstr ""
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
msgid "|URL|use OCSP responder at URL"
-msgstr "|ADR|bruk OCSP-svartjeneste ved valgt nettADResse"
+msgstr ""
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
-msgstr "|FPR|OCSP-svartjeneste signert av FPR"
+msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
-msgstr "|N|ikke vis flere enn N antall elementer per spørring"
+msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
-msgstr "|FIL|bruk CA-sertifikater i valgt FIL til HKP via TLS"
+msgstr ""
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
-msgstr "kjør all nettverkstrafikk gjennom Tor"
+msgstr ""
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
"options)\n"
msgstr ""
-"@\n"
-"Se «info»-bruksanvisning for fullstendig liste over alle kommandoer og valg\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
-msgstr "Bruk: @DIRMNGR@ [valg] (-h for hjelp)"
+msgstr ""
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
-"Syntaks: @DIRMNGR@ [valg] [kommando [arg]]\n"
-"Tilgang til nøkkeltjener, CRL og OCSP for @GNUPG@\n"
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
-msgstr "følgende feilsøkingsnivåer er gyldige: %s\n"
+msgstr ""
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, c-format
msgid "usage: %s [options] "
-msgstr "bruk: %s [valg] "
+msgstr ""
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
msgid "colons are not allowed in the socket name\n"
-msgstr "kolon tillates ikke i sokkelnavn\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
-msgstr "henting av CRL fra «%s» mislyktes: %s\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
-msgstr "behandling av CRL fra «%s» mislyktes: %s\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, c-format
msgid "%s:%u: line too long - skipped\n"
-msgstr "%s:%u: for lang linje. Hoppet over\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
-msgstr "%s:%u: oppdaget ugyldig fingeravtrykk\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, c-format
msgid "%s:%u: read error: %s\n"
-msgstr "%s:%u: lesefeil: %s\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
-msgstr "%s:%u: ignorerer ugyldige data ved linjeslutt\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
-msgstr "SIGHUP mottatt. Leser inn oppsett på nytt og tømmer hurtiglagre\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
-msgstr "SIGUSR2 mottatt. Ingen handling definert\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
-msgstr "SIGTERM mottatt. Slår av …\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
-msgstr "SIGTERM mottatt. %d tilkoblinger er fremdeles aktive\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
msgid "shutdown forced\n"
-msgstr "slår av under tvang\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
-msgstr "SIGINT mottatt. Slår av umiddelbart\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
-msgstr "signal %d mottatt. Ingen handling definert\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:138
msgid "return all values in a record oriented format"
-msgstr "vis alle verdier i oppføringsorientert format"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:141
msgid "|NAME|ignore host part and connect through NAME"
-msgstr "|NAVN|ignorer vertsdel og koble til med NAVN"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:142
msgid "|NAME|connect to host NAME"
-msgstr "|NAVN|koble til valgt vertsNAVN"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:143
msgid "|N|connect to port N"
-msgstr "|N|koble til port N"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:144
msgid "|NAME|use user NAME for authentication"
-msgstr "|NAVN|bruk valgt brukerNAVN til autentisering"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:145
msgid "|PASS|use password PASS for authentication"
-msgstr "|PASS|bruk valgt PASSord til autentisering "
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:147
msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr "hent passord fra $DIRMNGR_LDAP_PASS"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:148
msgid "|STRING|query DN STRING"
-msgstr "|STRENG|utfør spørring med valgt DN-STRENG"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:149
msgid "|STRING|use STRING as filter expression"
-msgstr "|STRENG|bruk valgt STRENG som filteruttrykk"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:150
msgid "|STRING|return the attribute STRING"
-msgstr "|STRENG|vis attributt valgt med STRENG"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:209
msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Bruk: dirmngr_ldap [valg] [ADR] (-h for hjelp)\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 ""
-"Syntaks: dirmngr_ldap [valg] [ADR]\n"
-"Internt LDAP-hjelpeverktøy for Dirmngr\n"
-"Grensesnitt og valgmuligheter kan endres uten varsel\n"
+#: dirmngr/dirmngr_ldap.c:337
#, c-format
msgid "invalid port number %d\n"
-msgstr "portnummer %d er ugyldig\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:413
#, c-format
msgid "scanning result for attribute '%s'\n"
-msgstr "ser gjennom treff for attributt «%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 "feil under skriving til std.utkanal: %s\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:437
#, c-format
msgid " available attribute '%s'\n"
-msgstr " tilgjengelig attributt «%s»\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:475
#, c-format
msgid "attribute '%s' not found\n"
-msgstr "fant ikke attributt «%s»\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:482
#, c-format
msgid "found attribute '%s'\n"
-msgstr "fant attributt «%s»\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:591
#, c-format
msgid "processing url '%s'\n"
-msgstr "behandler adresse «%s»\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:593
#, c-format
msgid " user '%s'\n"
-msgstr " bruker «%s»\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:595
#, c-format
msgid " pass '%s'\n"
-msgstr " passord «%s»\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:597
#, c-format
msgid " host '%s'\n"
-msgstr " vert «%s»\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:598
#, c-format
msgid " port %d\n"
-msgstr " port %d\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:600
#, c-format
msgid " DN '%s'\n"
-msgstr " DN «%s»\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:602
#, c-format
msgid " filter '%s'\n"
-msgstr " filter «%s»\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:607 dirmngr/dirmngr_ldap.c:610
#, c-format
msgid " attr '%s'\n"
-msgstr " attr «%s»\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:616
#, c-format
msgid "no host name in '%s'\n"
-msgstr "ingen vertsnavn i «%s»\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:621
#, c-format
msgid "no attribute given for query '%s'\n"
-msgstr "ingen attributt oppgitt for spørring «%s»\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:627
msgid "WARNING: using first attribute only\n"
-msgstr "ADVARSEL: bruker bare første attributt\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:636
#, c-format
msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "LDAP-init til «%s:%d» mislyktes: %s\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:659
#, c-format
msgid "binding to '%s:%d' failed: %s\n"
-msgstr "tilknytning til «%s:%d» mislyktes: %s\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:686
#, c-format
msgid "searching '%s' failed: %s\n"
-msgstr "søk etter «%s» mislyktes: %s\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:718
#, c-format
msgid "'%s' is not an LDAP URL\n"
-msgstr "«%s» er ikke en LDAP-adresse\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:724
#, c-format
msgid "'%s' is an invalid LDAP URL\n"
-msgstr "«%s» er en ugyldig LDAP-adresse\n"
+msgstr ""
+#: 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"
+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 "feil under minnetildeling: %s\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:207
#, c-format
msgid "error printing log line: %s\n"
-msgstr "feil under utskrift av logglinje: %s\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:236
#, c-format
msgid "error reading log from ldap wrapper %d: %s\n"
-msgstr "feil under lesing av logg fra ldap-grensesnitt %d: %s\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:304
#, c-format
msgid "npth_select failed: %s - waiting 1s\n"
-msgstr "npth_select mislyktes: %s - venter 1s\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:343
#, c-format
msgid "ldap wrapper %d ready"
-msgstr "ldap-grensesnitt %d klart"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:352
#, c-format
msgid "ldap wrapper %d ready: timeout\n"
-msgstr "ldap-grensesnitt %d klart: tidsavbrudd\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:355
#, c-format
msgid "ldap wrapper %d ready: exitcode=%d\n"
-msgstr "ldap-grensesnitt %d klart: avslutningskode=%d\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:364
#, c-format
msgid "waiting for ldap wrapper %d failed: %s\n"
-msgstr "venting på ldap-grensesnitt %d mislyktes: %s\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:376
#, c-format
msgid "ldap wrapper %d stalled - killing\n"
-msgstr "ldap-grensesnitt %d steilet - dreper prosess\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:444
#, c-format
msgid "error spawning ldap wrapper reaper thread: %s\n"
-msgstr "feil under oppbygging av «reaper»-tråd for ldap-grensesnitt: %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 "lesing fra ldap-grensesnitt %d mislyktes: %s\n"
+msgstr ""
+#: dirmngr/ldap.c:91
#, c-format
msgid "invalid char 0x%02x in host name - not added\n"
-msgstr "vertsnavn inneholder ugyldig tegn 0x%02x, og ble ikke lagt til\n"
+msgstr ""
+#: dirmngr/ldap.c:95
#, c-format
msgid "adding '%s:%d' to the ldap server list\n"
-msgstr "legger til «%s:%d» i ldap-tjenerliste\n"
+msgstr ""
+#: dirmngr/ldap.c:98 dirmngr/misc.c:512
#, c-format
msgid "malloc failed: %s\n"
-msgstr "malloc mislyktes: %s\n"
+msgstr ""
+#: dirmngr/ldap.c:618
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
-msgstr "start_cert_fetch: mønsteret «%s» er ugyldig\n"
+msgstr ""
+#: dirmngr/ldap.c:831
msgid "ldap_search hit the size limit of the server\n"
-msgstr "ldap_search overskred tjenerens størrelsesgrense\n"
+msgstr ""
+#: dirmngr/misc.c:172
msgid "invalid canonical S-expression found\n"
-msgstr "fant ugyldig generelt S-uttrykk\n"
+msgstr ""
+#: dirmngr/misc.c:196 dirmngr/misc.c:230
#, c-format
msgid "gcry_md_open failed: %s\n"
-msgstr "«gcry_md_open» mislyktes: %s\n"
+msgstr ""
+#: dirmngr/misc.c:201 dirmngr/misc.c:235
#, c-format
msgid "oops: ksba_cert_hash failed: %s\n"
-msgstr "obs: «ksba_cert_hash» mislyktes: %s\n"
+msgstr ""
+#: dirmngr/misc.c:528
msgid "bad URL encoding detected\n"
-msgstr "oppdaget ugyldig URL-koding\n"
+msgstr ""
+#: dirmngr/ocsp.c:80
#, c-format
msgid "error reading from responder: %s\n"
-msgstr "feil under lesing fra svartjeneste: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:98
#, c-format
msgid "response from server too large; limit is %d bytes\n"
-msgstr "for store responsdata fra tjener (grense: %d byte)\n"
+msgstr ""
+#: dirmngr/ocsp.c:139
msgid "OCSP request not possible due to Tor mode\n"
-msgstr "OCSP-forespørsel ikke mulig i Tor-modus\n"
+msgstr ""
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
-msgstr "OCSP-forespørsel ikke mulig når HTTP er slått av\n"
+msgstr ""
+#: dirmngr/ocsp.c:152
#, c-format
msgid "error setting OCSP target: %s\n"
-msgstr "feil under endring av OCSP-mål: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:170
#, c-format
msgid "error building OCSP request: %s\n"
-msgstr "feil under bygging av OCSP-forespørsel: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:183
#, c-format
msgid "error connecting to '%s': %s\n"
-msgstr "feil under tilkobling til «%s»: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:209 dirmngr/ocsp.c:257
#, c-format
msgid "error reading HTTP response for '%s': %s\n"
-msgstr "feil under lesing av HTTP-svar for «%s»: %s\n"
+msgstr ""
+#: 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"
+msgstr ""
+#: dirmngr/ocsp.c:290 dirmngr/ocsp.c:300
#, c-format
msgid "OCSP responder at '%s' status: %s\n"
-msgstr "Status for OCSP-svartjeneste ved «%s»: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:295
#, c-format
msgid "hashing the OCSP response for '%s' failed: %s\n"
-msgstr "summering av OCSP-svar for «%s» mislyktes: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:330
msgid "not signed by a default OCSP signer's certificate"
-msgstr "ikke signert av sertifikat som tilhører en forvalgt OCSP-fullmektig"
+msgstr ""
+#: dirmngr/ocsp.c:415
msgid "only SHA-1 is supported for OCSP responses\n"
-msgstr "OSCP-svar skal bare bruke SHA-1\n"
+msgstr ""
+#: dirmngr/ocsp.c:466
#, c-format
msgid "allocating list item failed: %s\n"
-msgstr "tildeling av listeelement mislyktes: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:481
#, c-format
msgid "error getting responder ID: %s\n"
-msgstr "feil under henting av svartjeneste-ID: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:516
msgid "no suitable certificate found to verify the OCSP response\n"
-msgstr "fant ingen sertifikat som egner seg til å bekrefte OCSP-svar\n"
+msgstr ""
+#: dirmngr/ocsp.c:555 dirmngr/validate.c:648
#, c-format
msgid "issuer certificate not found: %s\n"
-msgstr "fant ikke utstedersertifikat: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:565
msgid "caller did not return the target certificate\n"
-msgstr "klient sendte ikke målsertifikat\n"
+msgstr ""
+#: dirmngr/ocsp.c:572
msgid "caller did not return the issuing certificate\n"
-msgstr "klient sendte ikke utstedersertifikat\n"
+msgstr ""
+#: dirmngr/ocsp.c:582
#, c-format
msgid "failed to allocate OCSP context: %s\n"
-msgstr "klarte ikke å tildele OCSP-kontekst: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:616
#, c-format
msgid "can't get authorityInfoAccess: %s\n"
-msgstr "klarte ikke å hente «authorityInfoAccess»: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:623
msgid "no default OCSP responder defined\n"
-msgstr "ingen forvalgt OCSP-svartjeneste\n"
+msgstr ""
+#: dirmngr/ocsp.c:629
msgid "no default OCSP signer defined\n"
-msgstr "ingen OCSP-undertegner er definert som standard\n"
+msgstr ""
+#: dirmngr/ocsp.c:636
#, c-format
msgid "using default OCSP responder '%s'\n"
-msgstr "bruker forvalgt OCSP-svartjeneste «%s»\n"
+msgstr ""
+#: dirmngr/ocsp.c:641
#, c-format
msgid "using OCSP responder '%s'\n"
-msgstr "bruker OCSP-svartjeneste «%s»\n"
+msgstr ""
+#: dirmngr/ocsp.c:648
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
-msgstr "klarte ikke å sette opp kontrollsum-kontekst for OCSP: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:678
#, c-format
msgid "error getting OCSP status for target certificate: %s\n"
-msgstr "feil under henting av OCSP-status for målsertifikat: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:703
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
-msgstr "sertifikatstatus er: %s (dette=%s neste=%s)\n"
+msgstr ""
+#: dirmngr/ocsp.c:704
msgid "good"
-msgstr "bra"
+msgstr ""
+#: dirmngr/ocsp.c:710
#, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
-msgstr "sertifikat opphevet %s med følgende begrunnelse: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:745
msgid "OCSP responder returned a status in the future\n"
-msgstr "OCSP-svartjeneste sendte status datert i framtiden\n"
+msgstr ""
+#: dirmngr/ocsp.c:757
msgid "OCSP responder returned a non-current status\n"
-msgstr "OCSP-svartjeneste sendte status som ikke er datert i nåtid\n"
+msgstr ""
+#: dirmngr/ocsp.c:772
msgid "OCSP responder returned an too old status\n"
-msgstr "OCSP-svartjeneste sendte for gammel status\n"
+msgstr ""
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
-msgstr "«assuan_inquire»(%s) mislyktes: %s\n"
+msgstr ""
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
-msgstr "ldapserver mangler"
+msgstr ""
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
-msgstr "serienummer mangler i sertifikat-ID"
+msgstr ""
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, c-format
msgid "assuan_inquire failed: %s\n"
-msgstr "«assuan_inquire» mislyktes: %s\n"
+msgstr ""
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
-msgstr "«fetch_cert_by_url» mislyktes: %s\n"
+msgstr ""
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, c-format
msgid "error sending data: %s\n"
-msgstr "feil under sending av data: %s\n"
+msgstr ""
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, c-format
msgid "start_cert_fetch failed: %s\n"
-msgstr "«start_cert_fetch» mislyktes: %s\n"
+msgstr ""
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, c-format
msgid "fetch_next_cert failed: %s\n"
-msgstr "«fetch_next_cert» mislyktes: %s\n"
+msgstr ""
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
-msgstr "max_replies %d overskredet\n"
+msgstr ""
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, c-format
msgid "can't allocate control structure: %s\n"
-msgstr "klarte ikke å tildele kontrollstruktur: %s\n"
+msgstr ""
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, c-format
msgid "failed to allocate assuan context: %s\n"
-msgstr "klarte ikke å tildele assuan-kontekst: %s\n"
+msgstr ""
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
#, c-format
msgid "failed to initialize the server: %s\n"
-msgstr "klarte ikke å starte opp tjener: %s\n"
+msgstr ""
- #: dirmngr/server.c:2632
++#: dirmngr/server.c:2738
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
-msgstr "klarte ikke å registrere kommandoer i Assuan: %s\n"
+msgstr ""
- #: dirmngr/server.c:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
-msgstr "Assuan-godkjenningsproblem: %s\n"
+msgstr ""
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, c-format
msgid "Assuan processing failed: %s\n"
-msgstr "Assuan-behandling mislyktes: %s\n"
+msgstr ""
+#: dirmngr/validate.c:238
msgid "accepting root CA not marked as a CA"
-msgstr "godtar rot-CA som ikke er merket som CA"
+msgstr ""
+#: dirmngr/validate.c:264
msgid "CRL checking too deeply nested\n"
-msgstr "for mange nivåer av CRL-kontroll\n"
+msgstr ""
+#: dirmngr/validate.c:282
msgid "not checking CRL for"
-msgstr "lar være å kontrollere CRL for"
+msgstr ""
+#: dirmngr/validate.c:287
msgid "checking CRL for"
-msgstr "kontrollerer CRL for"
+msgstr ""
+#: dirmngr/validate.c:556
msgid "selfsigned certificate has a BAD signature"
-msgstr "selvsignert sertifikat har ugyldig signatur"
+msgstr ""
+#: dirmngr/validate.c:590
#, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
-msgstr "troverdighetssjekk av rotsertifikat mislyktes: %s\n"
+msgstr ""
+#: dirmngr/validate.c:769
msgid "certificate chain is good\n"
-msgstr "sertifikatkjede er funnet i orden\n"
+msgstr ""
+#: dirmngr/validate.c:1169
msgid "certificate should not have been used for CRL signing\n"
-msgstr "sertifikat skulle ikke vært brukt til CRL-signering\n"
+msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
msgid "quiet"
-msgstr "stille"
+msgstr ""
+#: tools/gpg-connect-agent.c:79
msgid "print data out hex encoded"
-msgstr "kod utdata i heksadesimaler"
+msgstr ""
+#: tools/gpg-connect-agent.c:80
msgid "decode received data lines"
-msgstr "dekod mottatte datalinjer"
+msgstr ""
+#: tools/gpg-connect-agent.c:81
msgid "connect to the dirmngr"
-msgstr "koble til dirmngr"
+msgstr ""
+#: tools/gpg-connect-agent.c:84
msgid "|NAME|connect to Assuan socket NAME"
-msgstr "|NAVN|koble til valgt Assuan-sokkelNAVN"
+msgstr ""
+#: tools/gpg-connect-agent.c:86
msgid "|ADDR|connect to Assuan server at ADDR"
-msgstr "|ADR|koble til Assuan-tjener på valgt nettADResse"
+msgstr ""
+#: tools/gpg-connect-agent.c:88
msgid "run the Assuan server given on the command line"
-msgstr "kjør valgt Assuan-tjener"
+msgstr ""
+#: tools/gpg-connect-agent.c:90
msgid "do not use extended connect mode"
-msgstr "ikke bruk utvidet tilkoblingsmodus"
+msgstr ""
+#: tools/gpg-connect-agent.c:92
msgid "|FILE|run commands from FILE on startup"
-msgstr "|FIL|kjør kommandoer fra valgt FIL ved oppstart"
+msgstr ""
+#: tools/gpg-connect-agent.c:93
msgid "run /subst on startup"
-msgstr "kjør /subst ved oppstart"
+msgstr ""
+#: tools/gpg-connect-agent.c:205
msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
-msgstr "Bruk: @GPG at -connect-agent [vlag] (-h for hjelp)"
+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 ""
-"Syntaks: @GPG at -connect-agent [valg]\n"
-"Koble til kjørende agent og send kommandoer\n"
+#: tools/gpg-connect-agent.c:1247
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
-msgstr "valget «%s» krever et program som argument\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 "ignorerer valget «%s» pga. «%s»\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
#, c-format
msgid "receiving line failed: %s\n"
-msgstr "linjemottak mislyktes: %s\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1458
msgid "line too long - skipped\n"
-msgstr "hoppet over for lang linje\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1462
msgid "line shortened due to embedded Nul character\n"
-msgstr "linje forkortet pga. innebygget Nul-tegn\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1837
#, c-format
msgid "unknown command '%s'\n"
-msgstr "«%s» er en ukjent kommando\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1855
#, c-format
msgid "sending line failed: %s\n"
-msgstr "sending av linje mislyktes: %s\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:2251
#, c-format
msgid "error sending standard options: %s\n"
-msgstr "feil under sending av standardvalg: %s\n"
+msgstr ""
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
-msgstr "Styring av diagnostikk-utdata"
+msgstr ""
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
-msgstr "Oppsettsvalg"
+msgstr ""
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
-msgstr "Nyttige feilsøkingsvalg"
+msgstr ""
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
-msgstr "Sikkerhetsvalg"
+msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|SSH-nøkler utgår etter N antall sekunder"
+msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-"|N|endre maksimal livstid for PIN-koder i hurtiglager til N antall sekunder"
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|endre maksimal livstid for SSH-nøkler til N antall sekunder"
+msgstr ""
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
-msgstr "Valg som håndhever passordfrase-regler"
+msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
-msgstr "ikke tillat avvik fra passordregler"
+msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|endre minimal passordfrase-lengde til N"
+msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr "|N|krev at passordfraser inneholder minst N antall spesialtegn og tall"
+msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|FIL|kontroller nye passordfraser mot mønster i valgt FIL"
+msgstr ""
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
msgid "|N|expire the passphrase after N days"
-msgstr "|N|regn passord som ugyldig etter N antall dager"
+msgstr ""
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
msgid "do not allow the reuse of old passphrases"
-msgstr "ikke tillat gjenbruk av gamle passordfraser"
+msgstr ""
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
-msgstr "|N|endre tidsavbrudd for PIN-inntasting til N antall sekunder"
+msgstr ""
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
-msgstr "|NAVN|bruk valgt NAVN som forvalgt hemmelig nøkkel"
+msgstr ""
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NAVN|krypter også til valgt bruker-id-NAVN"
+msgstr ""
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
-msgstr "|SPES|sett opp e-post-alias"
+msgstr ""
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
-msgstr "Oppsett for nøkkeltjenere"
+msgstr ""
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
msgid "|URL|use keyserver at URL"
-msgstr "|ADR|bruk nøkkeltjener på valgt nettADResse"
+msgstr ""
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
-msgstr "tillat PKA-oppslag (DNS-forespørsler)"
+msgstr ""
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr "|MEKANISMER|bruk valgte MEKANISME til å finne nøkler med e-postadresse"
+msgstr ""
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
-msgstr "slå av all tilgang til dirmngr"
+msgstr ""
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NAVN|bruk valgt kodeNAVN til PKCS#12-passordfraser"
+msgstr ""
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
-msgstr "ikke se etter rotsertifikater i CRL"
+msgstr ""
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
-msgstr "Valg som styrer utdata-format"
+msgstr ""
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
-msgstr "Valg som styrer grensesnitt og håndheving av regler"
+msgstr ""
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
-msgstr "Valg som styrer bruk av Tor"
+msgstr ""
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
-msgstr "Oppsett for HTTP-tjenere"
+msgstr ""
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
-msgstr "bruk systemets innstilling for HTTP-mellomtjener"
+msgstr ""
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
-msgstr "Oppsett for bruk av LDAP-tjenere"
+msgstr ""
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
-msgstr "LDAP-tjenerliste"
+msgstr ""
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
-msgstr "Oppsett for OCSP"
+msgstr ""
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
-msgstr "OpenPGP"
+msgstr ""
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
-msgstr "Privatnøkler"
+msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
-msgstr "Smartkort"
+msgstr ""
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
-msgstr "S/MIME"
+msgstr ""
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
msgid "Network"
-msgstr "Nettverk"
+msgstr ""
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
msgid "Passphrase Entry"
-msgstr "Skriving av passordfrase"
+msgstr ""
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
msgid "Component not suitable for launching"
-msgstr "Komponent egner seg ikke for oppstart"
+msgstr ""
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
-msgstr "Ekstern bekreftelse av komponent %s mislyktes"
+msgstr ""
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
-msgstr "Merk at gruppespesifikasjoner blir ignorert\n"
+msgstr ""
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, c-format
msgid "error closing '%s'\n"
-msgstr "feil under lukking av «%s»\n"
+msgstr ""
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, c-format
msgid "error parsing '%s'\n"
-msgstr "feil under tolkning av «%s»\n"
+msgstr ""
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
-msgstr "vis alle komponenter"
+msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
-msgstr "kontroller alle programmer"
+msgstr ""
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
-msgstr "|KOMPONENT|vis valg"
+msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
-msgstr "|KOMPONENT|endre valg"
+msgstr ""
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
-msgstr "|KOMPONENT|kontroller valg"
+msgstr ""
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
-msgstr "bruk globale standardverdier"
+msgstr ""
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
-msgstr "|FIL|oppdater oppsettsfiler ved bruk av valgt FIL"
+msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
-msgstr "hent oppsettsmapper for @GPGCONF@"
+msgstr ""
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
msgid "list global configuration file"
-msgstr "vis global oppsettsfil"
+msgstr ""
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
msgid "check global configuration file"
-msgstr "kontroller global oppsettsfil"
+msgstr ""
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
msgid "query the software version database"
-msgstr "søk i versjonsdatabase"
+msgstr ""
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
-msgstr "last inn én eller alle komponenter på nytt"
+msgstr ""
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
-msgstr "last inn valgt komponent"
+msgstr ""
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
-msgstr "drep valgt komponent"
+msgstr ""
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
-msgstr "bruk som utdatafil"
+msgstr ""
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
-msgstr "ta i bruk endringer under kjøring, hvis mulig"
+msgstr ""
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
msgid "Usage: @GPGCONF@ [options] (-h for help)"
-msgstr "Bruk: @GPGCONF@ [valg] (-h for hjelp)"
+msgstr ""
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
-"Syntaks: @GPGCONF@ [valg]\n"
-"Behandle oppsettsvalg for verktøy i @GNUPG at -systemet\n"
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
-msgstr "Komponent-argument mangler"
+msgstr ""
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
msgid "Component not found"
-msgstr "Fant ikke komponent"
+msgstr ""
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
msgid "No argument allowed"
-msgstr "Ingen argumenter tillatt"
+msgstr ""
+#: tools/symcryptrun.c:166
msgid ""
"@\n"
"Commands:\n"
diff --cc po/hu.po
index 6f8edcf,4afd8ef..f6616e5
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2004-06-19 21:53+0200\n"
"Last-Translator: Nagy Ferenc László <nfl at nfllab.com>\n"
"Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
@@@ -155,26 -126,11 +155,26 @@@ msgstr "rossz jelszó
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "%d%s védő algoritmus nem támogatott.\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -379,8 -296,6 +379,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "jelszóváltoztatás"
- #: agent/gpg-agent.c:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -390,124 -305,92 +390,124 @@@ msgstr "
"Opciók:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "A kulcsot lecserélték."
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "bőbeszédű mód"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "még szűkszavúbb mód"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 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:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "kulcsok keresése kulcsszerveren"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "bizalmi adatbázis frissítése"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, 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:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
#, fuzzy
msgid "allow presetting passphrase"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "nem támogatott"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -516,167 -399,119 +516,162 @@@ msgstr "nem támogatott
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
#, 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:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 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:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, 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:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s nem hozható létre: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
#, 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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, 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:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, 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:2241 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:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "Írom a titkos kulcsot a %s állományba.\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, 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:2327
++#: agent/gpg-agent.c:2351
#, 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:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2771
++#: agent/gpg-agent.c:2795
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: kihagyva: %s\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
@@@ -692,8 -525,6 +687,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -701,9 -532,6 +696,9 @@@ msgstr "
"@Parancsok:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -757,8 -577,6 +752,8 @@@ msgstr "Mégsem
msgid "error while asking for the passphrase: %s\n"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@@ -942,8 -725,6 +937,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@@ -1419,7 -1102,6 +1414,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
#, fuzzy
msgid "out of core\n"
msgstr "nem feldolgozott"
@@@ -1478,8 -1149,6 +1473,8 @@@ msgstr "A(z) %08lX nyilvános kulcsot n
msgid "waiting for lock %s...\n"
msgstr "Írom a titkos kulcsot a %s állományba.\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1664,8 -1296,6 +1659,8 @@@ msgstr "titkos kulcs nem áll rendelkez
msgid "OpenPGP card no. %s detected\n"
msgstr ""
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "Nem tudom ezt megcsinálni kötegelt módban!\n"
@@@ -1680,10 -1308,6 +1675,10 @@@ msgstr "Ez a parancs %s módban nem eng
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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Mit választ? "
@@@ -1745,17 -1356,11 +1740,17 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "Nincs hozzá tartozó nyilvános kulcs: %s\n"
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, 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:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
@@@ -1812,7 -1406,6 +1807,7 @@@ msgstr "Kulcsgenerálás sikertelen: %s
msgid "not an OpenPGP card"
msgstr "Nem találtam érvényes OpenPGP adatot.\n"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
@@@ -1848,13 -1435,10 +1843,13 @@@ msgstr "Milyen kulcsméretet szeretne?
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr ""
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "Felkerekítve %u bitre.\n"
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1909,9 -1483,6 +1904,9 @@@ msgstr " (%d) RSA (csak titkosítás)
msgid " (3) Authentication key\n"
msgstr ""
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Érvénytelen választás.\n"
@@@ -2052,22 -1593,14 +2047,22 @@@ msgstr "Az --output opció nem működi
msgid "can't open '%s'\n"
msgstr "Nem tudom megnyitni %s-t!\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "\"%s\" kulcs nem található: %s\n"
@@@ -2162,8 -1677,6 +2157,8 @@@ 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:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, fuzzy, c-format
msgid "cipher algorithm '%s' may not be used in %s mode\n"
msgstr ""
@@@ -2191,7 -1700,6 +2186,7 @@@ msgstr "A %s (%d) rejtjelező használa
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s titkosítva \"%s\" számára\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2317,27 -1801,21 +2312,27 @@@ msgstr "%s: kihagyva: %s\n
msgid "writing to '%s'\n"
msgstr "Írok a \"%s\" állományba.\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, 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:1904
++#: g10/export.c:1909
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "Írom a titkos kulcsot a %s állományba.\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "FIGYELEM: Semmit sem exportáltam.\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/plaintext.c:167 g10/plaintext.c:190
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
@@@ -2348,13 -1825,10 +2343,13 @@@ msgstr "Hiba \"%s\" létrehozásakor: %
msgid "[User ID not found]"
msgstr "[ismeretlen kulcs]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "Érvénytelen import opciók!\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2364,62 -1837,51 +2359,62 @@@
msgid "error looking up: %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "Hiba \"%s\" létrehozásakor: %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "Hiba \"%s\" létrehozásakor: %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
#, fuzzy
msgid "No fingerprint"
msgstr "megmutatja az ujjlenyomatot"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "\"%s\" titkos kulcs nem található: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, 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/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "Érvénytelen import opciók!\n"
@@@ -2629,7 -2045,6 +2624,7 @@@ msgstr "kanonikus szöveges mód haszn�
msgid "|FILE|write output to FILE"
msgstr "|fájl|bővítő modul betöltése"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "ne csináljon semmi változtatást"
@@@ -3019,7 -2361,6 +3014,7 @@@ msgstr "%s:%d: Érvénytelen export opc
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "FIGYELEM: A program core állományt hozhat létre!\n"
@@@ -3038,7 -2376,6 +3033,7 @@@ msgstr "%s és %s nem használható egy
msgid "%s makes no sense with %s!\n"
msgstr "%s értelmetlen %s mellett!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr ""
@@@ -3047,7 -2383,6 +3042,7 @@@
msgid "will not run with insecure memory due to %s\n"
msgstr "Írom a titkos kulcsot a %s állományba.\n"
- #: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
@@@ -3112,8 -2433,6 +3107,8 @@@ msgstr "Érvénytelen személyes tömö
msgid "%s does not yet work with %s\n"
msgstr "%s és %s egyelőre nem használható együtt!\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr ""
@@@ -3244,7 -2537,6 +3239,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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|ÁL|állapotinformációk írása ÁL állományleíróra"
@@@ -4621,7 -3639,6 +4616,7 @@@ msgstr "Továbbra is hozzá akarja adni
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Lehet, hogy nem adhat fotóazonosítót egy PGP2 stílusú kulcshoz!\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr ""
@@@ -4927,54 -3883,42 +4922,54 @@@ msgstr "Túl sok \"%c\" preferencia.\n
msgid "too many compression preferences\n"
msgstr "Túl sok \"%c\" preferencia.\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "Érvénytelen karakter a preferenciák között!\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "Sima aláírást írok.\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "Önaláírást írok.\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "Összefűző aláírást írok.\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Kulcsméret érvénytelen; %u bitet használok.\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Kulcsméretet felkerekítettem %u bitre.\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
#, fuzzy
msgid "Sign"
msgstr "sign"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
#, fuzzy
msgid "Encrypt"
msgstr "adat titkosítása"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr ""
@@@ -4988,157 -3932,126 +4983,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (csak titkosítás)\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Kérem, adja meg, milyen kulcsot kíván:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA és ElGamal (alapértelmezés)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA és ElGamal (alapértelmezés)\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (csak aláírás)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (csak aláírás)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (csak titkosítás)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (csak titkosítás)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (csak titkosítás)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (csak titkosítás)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA és ElGamal (alapértelmezés)\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (csak aláírás)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (csak titkosítás)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (csak titkosítás)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (csak titkosítás)\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Aláírás-jelölés: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Nincs %d indexű felhasználóazonosító!\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "Felkerekítve %u bitre.\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Milyen kulcsméretet szeretne? (1024) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Milyen kulcsméretet szeretne? (1024) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "A kívánt kulcsméret %u bit.\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Kérem, adja meg, milyen kulcsot kíván:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5154,7 -4067,6 +5149,7 @@@ msgstr "
" <n>m = a kulcs n hónapig érvényes\n"
" <n>y = a kulcs n évig érvényes\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5170,40 -4082,32 +5165,40 @@@ msgstr "
" <n>m = az aláírás n hónapig érvényes\n"
" <n>y = az aláírás n évig érvényes\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "Meddig érvényes a kulcs? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Meddig érvényes az aláírás? (0) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "Érvénytelen érték!\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s soha nem jár le.\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s soha nem jár le.\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s lejár: %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Az aláírás lejár: %s.\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5211,12 -4115,10 +5206,12 @@@ msgstr "
"Az Ön rendszere nem tud megjeleníteni 2038 utáni dátumokat.\n"
"Azonban kezelni helyesen tudja őket egészen 2106-ig.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Ez így helyes (i/n)? "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5227,7 -4129,6 +5222,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
#, fuzzy
msgid ""
"\n"
@@@ -5244,50 -4145,39 +5239,50 @@@ msgstr "
" \"Heinrich Heine (a költő) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Teljes név: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Érvénytelen karakter a névben!\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "A név lehet, hogy nem kezdődhet számmal!\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "A név legalább 5 karakter kell legyen!\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "E-mail cím: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "Ez nem érvényes e-mail cím.\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Megjegyzés: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Érvénytelen karakter a megjegyzésben!\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Ön a(z) %s karakterkódolást használja.\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5298,7 -4188,6 +5293,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Kérem, ne rakja az e-mail címet a teljes névbe vagy a megjegyzésbe!\n"
@@@ -5313,37 -4202,30 +5308,37 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnMmEeRrKk"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "(N)év, (M)egjegyzés, (E)-mail megváltoztatása vagy (K)ilépés? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"(N)év, (M)egjegyzés, (E)-mail megváltoztatása vagy (R)endben/(K)ilépés? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "(N)év, (M)egjegyzés, (E)-mail megváltoztatása vagy (K)ilépés? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr ""
"(N)év, (M)egjegyzés, (E)-mail megváltoztatása vagy (R)endben/(K)ilépés? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Kérem, előbb javítsa ki a hibát!\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
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"
@@@ -5355,13 -4237,10 +5350,13 @@@ msgstr "
"a lemezeket) a prímszám generálása alatt. Ez segíti a véletlenszám-\n"
"generátort, hogy entrópiát tudjon gyűjteni.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kulcsgenerálás sikertelen: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5369,68 -4248,55 +5364,68 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "\"%s\" már tömörített.\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "Mégis létrehozzam? "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "Mégis létrehozzam? "
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Kulcs létrehozása megszakítva.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "MEGJEGYZÉS: %08lX titkos kulcs %s-kor lejárt.\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "Írom a kulcsot a %s állományba.\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "Nem írható nyilvánoskulcs-karikát találtam: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "Hiba a(z) \"%s\" nyilvánoskulcs-karika írásakor: %s.\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
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:4837
++#: g10/keygen.c:4859
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5440,37 -4306,31 +5435,37 @@@ msgstr "
"kíván ilyen célra létrehozni, azt az \"--edit-key\" parancs segítségével\n"
"teheti meg.\n"
- #: g10/keygen.c:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, 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:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, 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:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
#, 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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
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:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
#, 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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Valóban létrehozzam? "
@@@ -6221,23 -4935,18 +6216,23 @@@ msgstr "Ez a fotó megfelelő (i/N/k)?
msgid "unable to display photo ID!\n"
msgstr "Nem tudom megjeleníteni a fotóazonosítót!\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Nincs megadva ok."
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "A kulcsot lecserélték."
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "A kulcs kompromittálódott."
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "A kulcs már nem használatos."
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "A felhasználói azonosító már nem érvényes."
@@@ -6318,7 -5014,6 +6313,7 @@@ msgid "
"\n"
msgstr ""
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Mit választ? "
@@@ -6465,47 -5132,38 +6460,47 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Nem biztos, hogy az aláírás a tulajdonoshoz tartozik.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: kihagyva: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: Kihagyva: Nyilvános kulcs nincs engedélyezve.\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: kihagyva: nyilvános kulcs már szerepel\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "Nem tudok kapcsolódni \"%s\" objektumhoz: %s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr ""
"Nem adott meg felhasználói azonosítót! (Használhatja a \"-r\" opciót.)\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6513,38 -5171,30 +6508,38 @@@ msgstr "
"\n"
"Adja meg a felhasználói azonosítót! Üres sorral fejezze be: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Nincs ilyen felhasználói azonosító.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr ""
"Kihagyva: Nyilvános kulcs már be lett állítva alapértelmezett címzettnek.\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "Nyilvános kulcs nincs engedélyezve.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "Kihagyva: Nyilvános kulcs már be lett állítva.\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "Nincsenek érvényes címzettek!\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
@@@ -6650,7 -5278,6 +6645,7 @@@ msgstr "Titkos kulcs rendelkezésre ál
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? "
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "ASCII-páncélozott kimenet kiválasztva.\n"
@@@ -6668,19 -5292,16 +6663,19 @@@ msgstr "Visszavonó igazolás létrehoz
msgid "no revocation keys found for \"%s\"\n"
msgstr "Nem találtam visszavonó kulcsot a következőhöz: \"%s\".\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? "
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6689,20 -5310,17 +6684,20 @@@
"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:577
++#: g10/revoke.c:590
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Visszavonó igazolás létrehozva.\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "\"%s\" titkos kulcs nem található: %s\n"
@@@ -6710,23 -5328,19 +6705,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6744,33 -5358,26 +6739,33 @@@ msgstr "
"adathordozó olvashatatlanná válik. De vigyázat: az Ön gépének nyomtatási\n"
"rendszere is tárolhatja az adatot, és mások esetleg hozzáférhetnek ehhez!\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Kérem, válassza ki a visszavonás okát:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Mégsem"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Valószínűleg a(z) %d. lehetőséget akarja választani.)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Adjon meg egy nem kötelező leírást! Üres sorral fejezze be:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Visszavonás oka: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(Nincs leírás.)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Ez így rendben van? "
@@@ -7178,10 -5711,6 +7173,10 @@@ msgstr "Hiba a jelszó létrehozásakor
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
@@@ -7213,7 -5737,6 +7208,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
@@@ -7525,18 -5999,14 +7520,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7601,7 -6059,6 +7596,7 @@@ msgstr "
msgid "no need for a trustdb check\n"
msgstr "Nincs szükség a bizalmi adatbázis ellenőrzésére.\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "A bizalmi adatbázis következő ellenőrzése: %s.\n"
@@@ -7629,14 -6081,12 +7624,14 @@@ msgstr "Kérem, hajtson végre egy --ch
msgid "checking the trustdb\n"
msgstr "Ellenőrzöm a bizalmi adatbázist.\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "Eddig %lu kulcsot dolgoztam fel.\n"
msgstr[1] "Eddig %lu kulcsot dolgoztam fel.\n"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7644,22 -6094,18 +7639,22 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d kulcsot feldolgoztam (%d érvényességszámlálót töröltem)\n"
msgstr[1] "%d kulcsot feldolgoztam (%d érvényességszámlálót töröltem)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "Nem találtam alapvetően megbízható kulcsot.\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "Nem találom az alapvetően megbízható %08lX kulcs nyilvános kulcsát!\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "%lu bizalmi rekord, %d típus: írás sikertelen: %s.\n"
@@@ -8090,76 -6450,60 +8085,76 @@@ msgstr "jelszóváltoztatás
msgid "|N|Initial New PIN"
msgstr ""
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|fájl|bővítő modul betöltése"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr ""
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
#, fuzzy
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
#, fuzzy
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
#, fuzzy
msgid "do not use the internal CCID driver"
msgstr "ne használja a terminált egyáltalán"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr ""
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr ""
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
#, fuzzy
msgid "deny the use of admin card commands"
msgstr "Egymásnak ellentmondó parancsok!\n"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8878,7 -7069,6 +8873,7 @@@ msgstr "kulcskarika hozzáadása a kulc
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|GÉPNÉV|kulcsszerver beállítása kulcsok kereséséhez"
@@@ -8938,17 -7118,14 +8933,17 @@@ msgstr " h = kulcs kihagyása\n
msgid "could not parse keyserver\n"
msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "Írok a \"%s\" állományba.\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, 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:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9899,116 -7886,88 +9894,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|fájl|bővítő modul betöltése"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
#, fuzzy
msgid "run without asking a user"
msgstr "Kilépjek mentés nélkül? "
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|fájl|bővítő modul betöltése"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10021,91 -7980,72 +10016,91 @@@ msgstr "
"@\n"
"(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "Használat: gpg [opciók] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
#, 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:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "Páncélozás nem sikerült: %s\n"
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "Páncélozás nem sikerült: %s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "A sor túl hosszú!\n"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "Olvasási hiba: %s.\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
#, fuzzy
msgid "shutdown forced\n"
msgstr "nem feldolgozott"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10549,77 -8398,61 +10544,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "Aláírás sikertelen: %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "Aláírás sikertelen: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "A kulcsblokk törlése sikertelen: %s.\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "A kulcsblokk törlése sikertelen: %s.\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "A kulcsblokk törlése sikertelen: %s.\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, 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:2603
++#: dirmngr/server.c:2709
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
#, 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:2632
++#: dirmngr/server.c:2738
#, 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:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10663,7 -8488,6 +10658,7 @@@ msgstr "%c%lu preferencia kétszer szer
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
#, fuzzy
msgid "quiet"
msgstr "kilépés|kilepes"
@@@ -10756,286 -8560,218 +10751,286 @@@ 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr ""
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr ""
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|N. sorszámú jelszómód használata"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
#, 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:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NÉV|NÉV rejtjelező algoritmus haszn. jelszavakhoz"
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "hálózati hiba"
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
msgid "Passphrase Entry"
msgstr "rossz jelszó"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
#, fuzzy
msgid "Component not suitable for launching"
msgstr "nyilvános kulcs nem található"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
#, fuzzy
msgid "list global configuration file"
msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
#, fuzzy
msgid "check global configuration file"
msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "bizalmi adatbázis frissítése"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "kimeneti állomány megadása"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
#, fuzzy
msgid "Component not found"
msgstr "nyilvános kulcs nem található"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
#, fuzzy
msgid "No argument allowed"
msgstr "Írom a titkos kulcsot a %s állományba.\n"
diff --cc po/id.po
index 2e3023b,e3f4b50..94feaab
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2004-06-17 16:32+0700\n"
"Last-Translator: Tedi Heriyanto <tedi_h at gmx.net>\n"
"Language-Team: Indonesian <translation-team-id at lists.sourceforge.net>\n"
@@@ -160,26 -131,11 +160,26 @@@ msgstr "passphrase yang buruk
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritma proteksi %d%s tidak didukung\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -384,8 -301,6 +384,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "ubah passphrase"
- #: agent/gpg-agent.c:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -395,124 -310,92 +395,124 @@@ msgstr "
"Pilihan:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "Kunci dilampaui"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "detil"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "lebih diam"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FILE|muat modul ekstensi FILE"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "cari kunci di keyserver"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "perbarui database trust"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, 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:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
#, fuzzy
msgid "allow presetting passphrase"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "tidak didukung"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -521,167 -404,119 +521,162 @@@ msgstr "tidak didukung
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "algoritma digest yang dipilih tidak valid\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 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:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, 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:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
#, 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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, 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:2241 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:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: read failed (n=%d): %s\n"
- #: agent/gpg-agent.c:2327
++#: agent/gpg-agent.c:2351
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: tidak dapat membuat direktori: %s\n"
- #: agent/gpg-agent.c:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2771
++#: agent/gpg-agent.c:2795
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "gagal perbarui rahasia: %s\n"
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: dilewati: %s\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
@@@ -697,8 -530,6 +692,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -706,9 -537,6 +701,9 @@@ msgstr "
"@Perintah:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -762,8 -582,6 +757,8 @@@ msgstr "Batal
msgid "error while asking for the passphrase: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
@@@ -947,8 -730,6 +942,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
@@@ -1424,7 -1107,6 +1419,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
#, fuzzy
msgid "out of core\n"
msgstr "tidak diproses"
@@@ -1483,8 -1154,6 +1478,8 @@@ msgstr "kunci publik %08lX tidak ditemu
msgid "waiting for lock %s...\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1670,8 -1302,6 +1665,8 @@@ msgstr "kunci rahasia tidak tersedia
msgid "OpenPGP card no. %s detected\n"
msgstr ""
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
@@@ -1686,10 -1314,6 +1681,10 @@@ msgstr "Perintah ini tidak dibolehkan s
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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Pilihan anda? "
@@@ -1751,17 -1362,11 +1746,17 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "tidak ada kunci publik yang sesuai: %s\n"
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, 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:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
@@@ -1818,7 -1412,6 +1813,7 @@@ msgstr "Pembuatan kunci gagal: %s\n
msgid "not an OpenPGP card"
msgstr "tidak ditemukan data OpenPGP yang valid.\n"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
@@@ -1854,13 -1441,10 +1849,13 @@@ msgstr "Keysize yang anda inginkan? (10
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr ""
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "dibulatkan hingga %u bit\n"
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1915,9 -1489,6 +1910,9 @@@ msgstr " (%d) RSA (hanya enkripsi)\n
msgid " (3) Authentication key\n"
msgstr ""
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Pilihan tidak valid.\n"
@@@ -2058,22 -1599,14 +2053,22 @@@ msgstr "--output tidak berfungsi untuk
msgid "can't open '%s'\n"
msgstr "tidak dapat membuka `%s'\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "gagal membaca keyblock: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
@@@ -2168,8 -1683,6 +2163,8 @@@ msgid "
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, fuzzy, c-format
msgid "cipher algorithm '%s' may not be used in %s mode\n"
msgstr ""
@@@ -2197,7 -1706,6 +2192,7 @@@ msgstr "memaksa cipher simetrik %s (%d
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s dienkripsi untuk: %s\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2322,27 -1806,21 +2317,27 @@@ msgstr "%s: dilewati: %s\n
msgid "writing to '%s'\n"
msgstr "menulis ke `%s'\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, 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:1904
++#: g10/export.c:1909
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "PERINGATAN: tidak ada yang diekspor\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2353,13 -1830,10 +2348,13 @@@ msgstr "kesalahan penciptaan : `%s': %s
msgid "[User ID not found]"
msgstr "[User id tidak ditemukan]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opsi impor tidak valid\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2369,60 -1842,49 +2364,60 @@@
msgid "error looking up: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "kesalahan penciptaan : `%s': %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "kesalahan penciptaan : `%s': %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
#, fuzzy
msgid "No fingerprint"
msgstr "tampilkan fingerprint"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
- #: g10/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "opsi impor tidak valid\n"
@@@ -2632,7 -2048,6 +2627,7 @@@ msgstr "gunakan mode teks kanonikal
msgid "|FILE|write output to FILE"
msgstr "|FILE|muat modul ekstensi FILE"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "jangan buat perubahan"
@@@ -3022,7 -2364,6 +3017,7 @@@ msgstr "%s:%d: opsi ekspor tidak valid\
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "PERINGATAN: program mungkin membuat file core!\n"
@@@ -3041,7 -2379,6 +3036,7 @@@ msgstr "%s tidak dibolehkan dengan %s!\
msgid "%s makes no sense with %s!\n"
msgstr "%s tidak masuk akal dengan %s!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr ""
@@@ -3050,7 -2386,6 +3045,7 @@@
msgid "will not run with insecure memory due to %s\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
@@@ -3115,8 -2436,6 +3110,8 @@@ msgstr "preferensi kompresi personal ti
msgid "%s does not yet work with %s\n"
msgstr "%s belum dapat dipakai dengan %s\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr ""
@@@ -3249,7 -2542,6 +3244,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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|tulis info status ke FD ini"
@@@ -4626,7 -3644,6 +4621,7 @@@ msgstr "Anda tetap ingin menambahkannya
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr ""
@@@ -4936,54 -3892,42 +4931,54 @@@ msgstr "terlalu banyak preferensi `%c'\
msgid "too many compression preferences\n"
msgstr "terlalu banyak preferensi `%c'\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "Karakter tidak valid dalam string preferensi\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "menulis signature direct\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "menulis self signature\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "menulis key binding signature\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "keysize tidak valid; menggunakan %u bit\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "keysize dibulatkan hingga %u bit\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
#, fuzzy
msgid "Sign"
msgstr "tandai"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
#, fuzzy
msgid "Encrypt"
msgstr "enkripsi data"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr ""
@@@ -4997,157 -3941,126 +4992,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (hanya enkripsi)\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Silakan pilih kunci yang anda inginkan:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA dan ElGamal (baku)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA dan ElGamal (baku)\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (hanya menandai)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (hanya menandai)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (hanya enkripsi)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA dan ElGamal (baku)\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (hanya menandai)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Notasi signature: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Tidak ada ID user dengan index %d\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "dibulatkan hingga %u bit\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Keysize yang anda inginkan? (1024) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Keysize yang anda inginkan? (1024) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Keysize yang diminta adalah %u bit\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Silakan pilih kunci yang anda inginkan:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5163,7 -4076,6 +5158,7 @@@ msgstr "
" <n>m = kunci berakhir dalam n bulan\n"
" <n>y = kunci berakhir dalam n tahun\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5179,40 -4091,32 +5174,40 @@@ msgstr "
" <n>m = signature berakhir dalam n bulan\n"
" <n>y = signature berakhir dalam n tahun\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "Kunci valid untuk? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Signature valid untuk? (0) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "nilai yang tidak valid\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s tidak pernah berakhir\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s tidak pernah berakhir\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s berakhir pada %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Signature kadaluarsa pada %s \n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5220,12 -4124,10 +5215,12 @@@ msgstr "
"Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
"Namun, ia dapat menanganinya secara benar hingga 2106.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Benar (y/t)? "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5236,7 -4138,6 +5231,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
#, fuzzy
msgid ""
"\n"
@@@ -5252,50 -4153,39 +5247,50 @@@ msgstr "
"user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Nama sebenarnya: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Karakter tidak valid dalam nama\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "Nama tidak boleh dimulai dengan digit\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "Nama harus berukuran minimum 5 karakter\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "Alamat email: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "Bukan alamat email yang valid\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Komentar: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Karakter tidak valid dalam komentar\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Anda menggunakan set karakter `%s'.\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5305,7 -4195,6 +5300,7 @@@ msgstr "
"Anda memilih USER-ID ini:\n"
" \"%s\"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
@@@ -5320,35 -4209,28 +5315,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoQq"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Silakan perbaiki kesalahan ini dulu\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
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"
@@@ -5360,13 -4242,10 +5355,13 @@@ msgstr "
"selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
"yang baik untuk memperoleh entropi.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Pembuatan kunci gagal: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5374,68 -4253,55 +5369,68 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' sudah dikompresi\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "Tetap dibuat? "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "Tetap dibuat? "
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Pembuatan kunci dibatalkan.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "menulis kunci publik ke `%s'\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "kesalahan menulis keyring publik `%s': %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5445,36 -4311,30 +5440,36 @@@ msgstr "
"mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
"untuk tujuan ini.\n"
- #: g10/keygen.c:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, 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:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, 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:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
#, 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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
msgid "Secret parts of primary key are not available.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
- #: g10/keygen.c:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Ingin diciptakan? "
@@@ -6217,23 -4931,18 +6212,23 @@@ msgstr "Apakah foto ini benar (y/N/q)?
msgid "unable to display photo ID!\n"
msgstr "tidak dapat menampilkan photo ID!\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Tidak ada alasan diberikan"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "Kunci dilampaui"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "Kunci ini telah dikompromikan"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "Kunci tidak lagi digunakan"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "ID User tidak lagi valid"
@@@ -6314,7 -5010,6 +6309,7 @@@ msgid "
"\n"
msgstr ""
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Keputusan anda? "
@@@ -6462,46 -5129,37 +6457,46 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Tidak pasti signature milik pemilik.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: dilewati: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: dilewati: kunci publik dimatikan\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: dilewati: kunci publik telah ada\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "tidak dapat terkoneksi ke `%s': %s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "algoritma hash tidak valid `%s'\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "algoritma hash tidak valid `%s'\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Anda tidak menspesifikasikan ID user. (anda dapat gunakan \"-r\")\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6509,37 -5167,29 +6504,37 @@@ msgstr "
"\n"
"Masukkan user ID. Akhiri dengan baris kosong: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Tidak ada ID user tersebut.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "Kunci publik dimatikan.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "dilewati: kunci publik telah diset\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "penerima baku tidak dikenal `%s'\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "tidak ada alamat yang valid\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "kunci %08lX: tidak ada ID user\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "kunci %08lX: tidak ada ID user\n"
@@@ -6644,7 -5272,6 +6639,7 @@@ msgstr "Kunci rahasia tersedia.\n
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Buat sertifikat pembatalan untuk kunci ini?"
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "Pemaksaan output mode ASCII.\n"
@@@ -6662,19 -5286,16 +6657,19 @@@ msgstr "Sertifikat pembatalan tercipta.
msgid "no revocation keys found for \"%s\"\n"
msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Buat sertifikat pembatalan untuk kunci ini?"
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6683,20 -5304,17 +6678,20 @@@
"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:577
++#: g10/revoke.c:590
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Sertifikat pembatalan tercipta.\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
@@@ -6704,23 -5322,19 +6699,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Buat sertifikat pembatalan untuk kunci ini?"
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6740,34 -5354,27 +6735,34 @@@ msgstr "
"pencetakan\n"
"mesin anda mungkin menyimpan data dan menyediakannya untuk yang lain!\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Silakan pilih alasan untuk pembatalan:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Batal"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Mungkin anda ingin memilih %d di sini)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr ""
"Masukkan sebuah deskripsi opsional; akhiri dengan sebuah baris kosong:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Alasan pembatalan: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(Tidak diberikan deskripsi)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Ini oke? "
@@@ -7172,10 -5705,6 +7167,10 @@@ msgstr "kesalahan penciptaan passphrase
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
@@@ -7207,7 -5731,6 +7202,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
@@@ -7519,18 -5993,14 +7514,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7594,7 -6052,6 +7589,7 @@@ msgstr "
msgid "no need for a trustdb check\n"
msgstr "tidak perlu memeriksa trustdb\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "pemeriksaan trustdb berikutnya pada %s\n"
@@@ -7622,14 -6074,12 +7617,14 @@@ msgstr "lakukanlah --check-trustdb\n
msgid "checking the trustdb\n"
msgstr "memeriksa trustdb\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "%lu kunci telah diproses\n"
msgstr[1] "%lu kunci telah diproses\n"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7637,22 -6087,18 +7632,22 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d kunci diproses (%d hitungan validitas dihapus)\n"
msgstr[1] "%d kunci diproses (%d hitungan validitas dihapus)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@@ -8083,76 -6443,60 +8078,76 @@@ msgstr "ubah passphrase
msgid "|N|Initial New PIN"
msgstr ""
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|FILE|muat modul ekstensi FILE"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr ""
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
#, fuzzy
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
#, fuzzy
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
#, fuzzy
msgid "do not use the internal CCID driver"
msgstr "jangan menggunakan terminal"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr ""
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr ""
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
#, fuzzy
msgid "deny the use of admin card commands"
msgstr "perintah saling konflik\n"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8871,7 -7062,6 +8866,7 @@@ msgstr "tambah keyring ini ke daftar ke
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
@@@ -8931,17 -7111,14 +8926,17 @@@ msgstr " s = lewati kunci ini\n
msgid "could not parse keyserver\n"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "menulis ke `%s'\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "tidak dapat menutup `%s': %s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9892,116 -7879,88 +9887,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|muat modul ekstensi FILE"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
#, fuzzy
msgid "run without asking a user"
msgstr "Berhenti tanpa menyimpan? "
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|muat modul ekstensi FILE"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10014,91 -7973,72 +10009,91 @@@ msgstr "
"@\n"
"(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "pemakaian: gpg [pilihan] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
#, 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:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "baris terlalu panjang\n"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "kesalahan: fingerprint tidak valid\n"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "kesalahan pembacaan: %s\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
#, fuzzy
msgid "shutdown forced\n"
msgstr "tidak diproses"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10542,77 -8391,61 +10537,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "gagal menandai: %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "gagal menandai: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: gagal membuat hashtable: %s\n"
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
#, 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:2632
++#: dirmngr/server.c:2738
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "gagal membuat kembali cache keyring: %s\n"
- #: dirmngr/server.c:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10656,7 -8481,6 +10651,7 @@@ msgstr "preferensi %c%lu ganda \n
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
#, fuzzy
msgid "quiet"
msgstr "q|k|keluar"
@@@ -10749,286 -8553,218 +10744,286 @@@ 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr ""
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr ""
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|gunakan passphrase mode N"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAMA|enkripsi untuk NAMA"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "kesalahan jaringan"
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
msgid "Passphrase Entry"
msgstr "passphrase yang buruk"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
#, fuzzy
msgid "Component not suitable for launching"
msgstr "kunci publik tidak ditemukan"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
#, fuzzy
msgid "list global configuration file"
msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
#, fuzzy
msgid "check global configuration file"
msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "perbarui database trust"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "gunakan sebagai file output"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
#, fuzzy
msgid "Component not found"
msgstr "kunci publik tidak ditemukan"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
#, fuzzy
msgid "No argument allowed"
msgstr "menulis kunci rahasia ke `%s'\n"
diff --cc po/it.po
index e1bfda9,1eb3a79..121c31f
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2008-05-26 12:02+0200\n"
"Last-Translator: Marco d'Itri <md at linux.it>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@@ -155,26 -126,11 +155,26 @@@ msgstr "passphrase errata
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "l'algoritmo di protezione %d%s non è gestito\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -379,8 -296,6 +379,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "cambia la passphrase"
- #: agent/gpg-agent.c:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -390,124 -305,92 +390,124 @@@ msgstr "
"Opzioni:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "Questa chiave è stata sostituita"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "prolisso"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "meno prolisso"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "cerca delle chiavi su un keyserver"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "aggiorna il database della fiducia"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, 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:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
#, fuzzy
msgid "allow presetting passphrase"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "non gestito"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -516,167 -399,119 +516,162 @@@ msgstr "non gestito
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non è valido\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 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:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, 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:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "impossibile creare %s: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
#, 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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, 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:2241 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:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "trustdb: read fallita (n=%d): %s\n"
- #: agent/gpg-agent.c:2327
++#: agent/gpg-agent.c:2351
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: impossibile creare la directory: %s\n"
- #: agent/gpg-agent.c:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2771
++#: agent/gpg-agent.c:2795
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "aggiornamento della chiave segreta fallito: %s\n"
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: saltata: %s\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
@@@ -692,8 -525,6 +687,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -701,9 -532,6 +696,9 @@@ msgstr "
"@Comandi:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -757,8 -577,6 +752,8 @@@ msgstr "Cancella
msgid "error while asking for the passphrase: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -942,8 -725,6 +937,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -1421,7 -1104,6 +1416,7 @@@ msgid "command \"%.50s\" is ambiguous\n
msgstr ""
# ??? (Md)
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
#, fuzzy
msgid "out of core\n"
msgstr "non esaminato"
@@@ -1480,8 -1151,6 +1475,8 @@@ msgstr "chiave pubblica %08lX non trova
msgid "waiting for lock %s...\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1667,8 -1299,6 +1662,8 @@@ msgstr "la chiave segreta non è dispon
msgid "OpenPGP card no. %s detected\n"
msgstr ""
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "impossibile fare questo in modo batch\n"
@@@ -1683,10 -1311,6 +1678,10 @@@ msgstr "Questo comando non è permesso
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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Cosa scegli? "
@@@ -1749,17 -1360,11 +1744,17 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "non c'è una chiave pubblica corrispondente: %s\n"
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, 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:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "errore scrivendo il portachiavi `%s': %s\n"
@@@ -1816,7 -1410,6 +1811,7 @@@ msgstr "Generazione della chiave fallit
msgid "not an OpenPGP card"
msgstr "Non sono stati trovati dati OpenPGP validi.\n"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
@@@ -1852,13 -1439,10 +1847,13 @@@ msgstr "Di che dimensioni vuoi la chiav
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr ""
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrotondate a %u bit\n"
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1913,9 -1487,6 +1908,9 @@@ msgstr " (%d) RSA (cifra solo)\n
msgid " (3) Authentication key\n"
msgstr ""
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Scelta non valida.\n"
@@@ -2056,22 -1597,14 +2051,22 @@@ msgstr "--output non funziona con quest
msgid "can't open '%s'\n"
msgstr "impossibile aprire `%s'\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "errore leggendo il keyblock: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "chiave `%s' non trovata: %s\n"
@@@ -2169,8 -1684,6 +2164,8 @@@ msgstr "
"forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
"del destinatario\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, 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"
@@@ -2201,7 -1710,6 +2196,7 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrato per: \"%s\"\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2328,27 -1812,21 +2323,27 @@@ msgstr "%s: saltata: %s\n
msgid "writing to '%s'\n"
msgstr "scrittura in `%s'\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, 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:1904
++#: g10/export.c:1909
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "ATTENZIONE: non è stato esportato nulla\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2359,13 -1836,10 +2354,13 @@@ msgstr "errore creando `%s': %s\n
msgid "[User ID not found]"
msgstr "[User ID non trovato]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2375,60 -1848,49 +2370,60 @@@
msgid "error looking up: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "errore creando il portachiavi `%s': %s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "errore creando `%s': %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "errore creando `%s': %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
#, fuzzy
msgid "No fingerprint"
msgstr "mostra le impronte digitali"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "chiave segreta `%s' non trovata: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOME|usa NOME come chiave segreta predefinita"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOME|usa NOME come chiave segreta predefinita"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, 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/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "opzioni di importazione non valide\n"
@@@ -2638,7 -2054,6 +2633,7 @@@ msgstr "usa il modo testo canonico
msgid "|FILE|write output to FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "non fa cambiamenti"
@@@ -3029,7 -2371,6 +3024,7 @@@ msgstr "%s:%d: opzioni di esportazione
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
@@@ -3048,7 -2386,6 +3043,7 @@@ msgstr "Non è permesso usare %s con %s
msgid "%s makes no sense with %s!\n"
msgstr "Non ha senso usare %s con %s!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr ""
@@@ -3057,7 -2393,6 +3052,7 @@@
msgid "will not run with insecure memory due to %s\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non è valido\n"
@@@ -3122,8 -2443,6 +3117,8 @@@ msgstr "preferenze personali di compres
msgid "%s does not yet work with %s\n"
msgstr "%s non funziona ancora con %s\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
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"
@@@ -3255,7 -2548,6 +3250,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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|scrivi le informazioni di stato sul FD"
@@@ -4635,7 -3653,6 +4630,7 @@@ msgid "You may not add a photo ID to a
msgstr ""
"Non è possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr ""
@@@ -4951,54 -3907,42 +4946,54 @@@ msgstr "ci sono troppe preferenze `%c'\
msgid "too many compression preferences\n"
msgstr "ci sono troppe preferenze `%c'\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "carattere non valido nella stringa delle preferenze\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "scrittura della firma diretta\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "scrittura della autofirma\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "scrittura della firma di collegamento alla chiave\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "dimensione della chiave non valida; uso %u bit\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "dimensioni della chiave arrotondate a %u bit\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
#, fuzzy
msgid "Sign"
msgstr "sign"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
#, fuzzy
msgid "Encrypt"
msgstr "cifra dati"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr ""
@@@ -5012,157 -3956,126 +5007,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (cifra solo)\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Per favore scegli che tipo di chiave vuoi:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA e ElGamal (default)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA e ElGamal (default)\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (firma solo)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (firma solo)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (cifra solo)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (cifra solo)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (cifra solo)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (cifra solo)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA e ElGamal (default)\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (firma solo)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (cifra solo)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (cifra solo)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (cifra solo)\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Annotazione della firma: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Nessun user ID con l'indice %d\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "arrotondate a %u bit\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Di che dimensioni vuoi la chiave? (1024) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Di che dimensioni vuoi la chiave? (1024) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "La dimensione richiesta della chiave è %u bit\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Per favore scegli che tipo di chiave vuoi:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5178,7 -4091,6 +5173,7 @@@ msgstr "
" <n>m = la chiave scadrà dopo n mesi\n"
" <n>y = la chiave scadrà dopo n anni\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5194,40 -4106,32 +5189,40 @@@ msgstr "
" <n>m = la chiave scadrà dopo n mesi\n"
" <n>y = la chiave scadrà dopo n anni\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "Chiave valida per? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Firma valida per? (0) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "valore non valido\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s non ha scadenza\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s non ha scadenza\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s scadrà il %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Questa firma scadrà il %s\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5235,12 -4139,10 +5230,12 @@@ msgstr "
"Il tuo sistema non può mostrare date oltre il 2038.\n"
"Comunque, sarà gestita correttamente fino al 2106.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "È giusto (s/n)? "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5251,7 -4153,6 +5246,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
#, fuzzy
msgid ""
"\n"
@@@ -5268,50 -4169,39 +5263,50 @@@ msgstr "
" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Nome e Cognome: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Carattere non valido nel nome\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "Il nome non può iniziare con una cifra\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "Indirizzo di Email: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "L'indirizzo di email non è valido\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Commento: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Carattere non valido nel commento\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Stai usando il set di caratteri `%s'.\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5322,7 -4212,6 +5317,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
@@@ -5337,35 -4226,28 +5332,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Per favore correggi prima l'errore\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
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"
@@@ -5377,13 -4259,10 +5372,13 @@@ msgstr "
"dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
"numeri casuali migliori possibilità di raccogliere abbastanza entropia.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generazione della chiave fallita: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5391,66 -4270,53 +5386,66 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' è già compresso\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "Uso lo stesso questa chiave? "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
#, fuzzy
msgid "creating anyway\n"
msgstr "genera una nuova coppia di chiavi"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Generazione della chiave annullata.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "impossibile creare `%s': %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "NOTA: chiave %08lX scaduta il %s\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "scrittura della chiave pubblica in `%s'\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "non è stato trovato un portachiavi pubblico scrivibile: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "chiavi pubbliche e segrete create e firmate.\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5460,7 -4326,6 +5455,7 @@@ msgstr "
"il comando \"--edit-key\" per generare una chiave secondaria per questo "
"scopo.\n"
- #: g10/keygen.c:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5468,7 -4333,6 +5463,7 @@@ msgstr "
"la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
- #: g10/keygen.c:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5476,22 -4340,18 +5471,22 @@@ msgstr "
"la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
#, 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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
msgid "Secret parts of primary key are not available.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
- #: g10/keygen.c:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crea davvero? "
@@@ -6238,23 -4952,18 +6233,23 @@@ msgstr "Questa foto è giusta? (s/N/q)
msgid "unable to display photo ID!\n"
msgstr "impossibile mostrare l'ID fotografico\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Nessuna ragione specificata"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "Questa chiave è stata sostituita"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "Questa chiave è stata compromessa"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "La chiave non è più usata"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "L'user ID non è più valido"
@@@ -6335,7 -5031,6 +6330,7 @@@ msgid "
"\n"
msgstr ""
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Cosa hai deciso? "
@@@ -6485,46 -5152,37 +6480,46 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Non è sicuro che la firma appartenga al proprietario.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: saltata: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: saltata: chiave pubblica disabilitata\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: saltata: chiave pubblica già presente\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "impossibile connettersi a `%s': %s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "algoritmo di hash non valido `%s'\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "algoritmo di hash non valido `%s'\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Non hai specificato un user ID. (puoi usare \"-r\")\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6532,37 -5190,29 +6527,37 @@@ msgstr "
"\n"
"Inserisci l'user ID. Termina con una riga vuota: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "User ID inesistente.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "saltata: chiave pubblica già impostata come destinatario predefinito\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "La chiave pubblica è disabilitata.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "saltata: chiave pubblica già impostata\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "nessun indirizzo valido\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "chiave %08lX: nessun user ID\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "chiave %08lX: nessun user ID\n"
@@@ -6669,7 -5297,6 +6664,7 @@@ msgstr "È disponibile una chiave segre
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Creare un certificato di revoca per questa chiave? "
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "Forzato l'output con armatura ASCII.\n"
@@@ -6687,19 -5311,16 +6682,19 @@@ msgstr "Certificato di revoca creato.\n
msgid "no revocation keys found for \"%s\"\n"
msgstr "non sono state trovate chiavi di revoca per `%s'\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Creare un certificato di revoca per questa chiave? "
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6708,20 -5329,17 +6703,20 @@@
"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:577
++#: g10/revoke.c:590
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Certificato di revoca creato.\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "chiave segreta `%s' non trovata: %s\n"
@@@ -6729,23 -5347,19 +6724,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "errore creando il portachiavi `%s': %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Creare un certificato di revoca per questa chiave? "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6765,33 -5379,26 +6760,33 @@@ msgstr "
"disponibili\n"
"ad altri!\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Per favore scegli il motivo della revoca:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Cancella"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Probabilmente volevi scegliere %d)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Inserisci una descrizione opzionale; terminala con una riga vuota:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Motivo della revoca: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(Non è stata data una descrizione)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Va bene così? "
@@@ -7210,10 -5743,6 +7205,10 @@@ msgstr "errore nella creazione della pa
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -7245,7 -5769,6 +7240,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -7557,18 -6031,14 +7552,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7633,7 -6091,6 +7628,7 @@@ msgstr "
msgid "no need for a trustdb check\n"
msgstr "non è necessario un controllo del trustdb\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "il prossimo controllo del trustdb sarà fatto il %s\n"
@@@ -7661,14 -6113,12 +7656,14 @@@ msgstr "per favore usa --check-trustdb\
msgid "checking the trustdb\n"
msgstr "controllo il trustdb\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "Per ora sono state esaminate %lu chiavi\n"
msgstr[1] "Per ora sono state esaminate %lu chiavi\n"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7676,22 -6126,18 +7671,22 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d chiavi processate (%d conteggi di validità azzerati)\n"
msgstr[1] "%d chiavi processate (%d conteggi di validità azzerati)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "non è stata trovata alcuna chiave definitivamente affidabile\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "trust record %lu, req type %d: write fallita: %s\n"
@@@ -8122,76 -6482,60 +8117,76 @@@ msgstr "cambia la passphrase
msgid "|N|Initial New PIN"
msgstr ""
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr ""
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
#, fuzzy
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NOME|usa NOME come destinatario predefinito"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
#, fuzzy
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NOME|usa NOME come destinatario predefinito"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
#, fuzzy
msgid "do not use the internal CCID driver"
msgstr "non usa per niente il terminale"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr ""
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr ""
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
#, fuzzy
msgid "deny the use of admin card commands"
msgstr "comandi in conflitto\n"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8909,7 -7100,6 +8904,7 @@@ msgstr "aggiungi questo portachiavi all
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOME|usa NOME come chiave segreta predefinita"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|cerca le chiavi in questo keyserver"
@@@ -8969,17 -7149,14 +8964,17 @@@ msgstr " s = salta questa chiave\n
msgid "could not parse keyserver\n"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "scrittura in `%s'\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "impossibile chiudere `%s': %s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9932,116 -7919,88 +9927,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
#, fuzzy
msgid "run without asking a user"
msgstr "Esco senza salvare? "
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10054,92 -8013,73 +10049,92 @@@ msgstr "
"@\n"
"(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uso: gpg [opzioni] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
#, 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:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "riga troppo lunga\n"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "errore: impronta digitale non valida\n"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "errore di lettura: %s\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
# ??? (Md)
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
#, fuzzy
msgid "shutdown forced\n"
msgstr "non esaminato"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10583,77 -8432,61 +10578,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "firma fallita: %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "firma fallita: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "impossibile creare `%s': %s\n"
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: creazione della tabella hash fallita: %s\n"
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
#, 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:2632
++#: dirmngr/server.c:2738
#, 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:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10697,7 -8522,6 +10692,7 @@@ msgstr "la preferenza %c%lu è doppia\n
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
#, fuzzy
msgid "quiet"
msgstr "quit"
@@@ -10790,286 -8594,218 +10785,286 @@@ 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr ""
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr ""
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|usa il modo N per la passphrase"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "errore nella creazione della passhprase: %s\n"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|usa NOME come chiave segreta predefinita"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOME|cifra per NOME"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
#, 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:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "errore di rete"
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
msgid "Passphrase Entry"
msgstr "passphrase errata"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
#, fuzzy
msgid "Component not suitable for launching"
msgstr "chiave pubblica non trovata"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "errore leggendo `%s': %s\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "errore leggendo `%s': %s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
#, fuzzy
msgid "list global configuration file"
msgstr "elemento della configurazione sconosciuto \"%s\"\n"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
#, fuzzy
msgid "check global configuration file"
msgstr "elemento della configurazione sconosciuto \"%s\"\n"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "aggiorna il database della fiducia"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "usa come file di output"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
#, fuzzy
msgid "Component not found"
msgstr "chiave pubblica non trovata"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
#, fuzzy
msgid "No argument allowed"
msgstr "scrittura della chiave segreta in `%s'\n"
diff --cc po/ja.po
index 5045fa0,ac4ad78..421fa85
--- a/po/ja.po
+++ b/po/ja.po
@@@ -8,10 -8,9 +8,10 @@@
#
msgid ""
msgstr ""
- "Project-Id-Version: gnupg 2.2.2\n"
+ "Project-Id-Version: gnupg 2.2.3\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-11-20 12:04+0100\n"
- "PO-Revision-Date: 2017-11-07 11:11+0900\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
+ "PO-Revision-Date: 2017-12-18 14:07+0900\n"
"Last-Translator: NIIBE Yutaka <gniibe at fsij.org>\n"
"Language-Team: none\n"
"Language: ja\n"
@@@ -154,25 -125,10 +154,25 @@@ msgstr "パスフレーズが不正で�
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:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, c-format
msgid "can't open '%s': %s\n"
msgstr "'%s'が開けません: %s\n"
@@@ -370,8 -287,6 +370,8 @@@ msgstr "新しい鍵を保護するた�
msgid "Please enter the new passphrase"
msgstr "新しいパスフレーズを入力してください"
- #: agent/gpg-agent.c:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -379,132 -294,93 +379,132 @@@ msgstr "
"@オプション:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr "デーモン・モードで実行 (バックグラウンド)"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr "サーバ・モードで実行 (フォアグラウンド)"
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
msgid "run in supervised mode"
msgstr "スーパーバイズド・モードで実行"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "冗長"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "いくらかおとなしく"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr "sh-形式のコマンド出力"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr "csh-形式のコマンド出力"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|FILE|FILEからオプションを読み込みます"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr "コンソールからデタッチしない"
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "サーバのログ・ファイルを使う"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|PGMをPIN入力プログラムとして使う"
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|PGMをSCdaemonプログラムとして使う"
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
msgid "do not use the SCdaemon"
msgstr "SCdaemonを使わない"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|NAMEからのコマンドを受け付ける"
- #: agent/gpg-agent.c:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr "TTYの変更要求を無視する"
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr "Xディスプレイの変更要求を無視する"
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|N秒後に保持したPINを無効とする"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr "署名に対してPINの保持を使わない"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
msgid "disallow the use of an external password cache"
msgstr "外部のパスワードキャッシュの使用を認めない"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr "クライアントが鍵に\"trusted\"マークをつけることを認めない"
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
msgid "allow presetting passphrase"
msgstr "パスフレーズの事前設定を認める"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr "pinentryより優先してパスフレーズ入力を認めない"
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr "Emacsを通じてパスフレーズを催促することを認める"
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
msgid "enable ssh support"
msgstr "sshサポートを有功にする"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr "|ALGO|ssh署名の表示にALGOを使う"
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
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:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "バグは <@EMAIL@> までご報告ください。\n"
- #: agent/gpg-agent.c:513
++#: agent/gpg-agent.c:523
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "使い方: @GPG_AGENT@ [オプション] (ヘルプは -h)"
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -512,140 -388,99 +512,135 @@@ msgstr "
"形式: @GPG_AGENT@ [オプション] [コマンド [引数]]\n"
"@GnuPG@の秘密鍵の管理\n"
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "無効なdebug-level '%s'が与えられました\n"
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "選択されたダイジェスト・アルゴリズムは、無効です\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "*注意*: デフォルトのオプション・ファイル '%s' がありません\n"
- #: agent/gpg-agent.c:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "オプション・ファイル '%s': %s\n"
- #: agent/gpg-agent.c:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, c-format
msgid "reading options from '%s'\n"
msgstr "'%s' からオプションを読み込みます\n"
- #: agent/gpg-agent.c:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "*注意*: '%s'はオプションとは考えられません\n"
- #: agent/gpg-agent.c:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, c-format
msgid "can't create socket: %s\n"
msgstr "ソケットが作成できません: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "ソケット名'%s'は長すぎます\n"
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agentは既に実行されています - 新しいものをスタートさせません\n"
- #: agent/gpg-agent.c:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
msgid "error getting nonce for the socket\n"
msgstr "ソケットのナンス取得エラー\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "'%s'でソケットのバインドのエラー: %s\n"
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "'%s'の許可が設定できません: %s\n"
- #: agent/gpg-agent.c:2241 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
- #, c-format
- msgid "listen() failed: %s\n"
- msgstr "listen() に失敗しました: %s\n"
-
- #: agent/gpg-agent.c:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, c-format
msgid "listening on socket '%s'\n"
msgstr "ソケット'%s'でlisten\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "'%s'でstat()が失敗しました: %s\n"
- #: agent/gpg-agent.c:2327
++#: agent/gpg-agent.c:2351
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "'%s'をホーム・ディレクトリに使えません\n"
- #: agent/gpg-agent.c:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fd %dでナンスの読み込みエラー: %s\n"
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "ハンドラ0x%lx (fd %d に対する)が開始\n"
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "ハンドラ0x%lx (fd %d に対する)が終了\n"
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "ssh ハンドラ0x%lx (fd %d に対する)が開始\n"
- #: agent/gpg-agent.c:2771
++#: agent/gpg-agent.c:2795
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh ハンドラ0x%lx (fd %d に対する)が終了\n"
- #: agent/gpg-agent.c:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_pselectに失敗しました: %s - 一秒待ちます\n"
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s 停止しました\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "このセッションでgpg-agentは実行されていません\n"
@@@ -661,8 -494,6 +656,8 @@@ msgstr "
"形式: gpg-preset-passphrase [オプション] KEYGRIP\n"
"パスワードキャッシュの管理\n"
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -670,9 -501,6 +665,9 @@@ msgstr "
"@コマンド:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -728,8 -548,6 +723,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:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, c-format
msgid "error opening '%s': %s\n"
msgstr "'%s'を開く際、エラー: %s\n"
@@@ -913,8 -696,6 +908,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, c-format
msgid "error forking process: %s\n"
msgstr "プロセスforkエラー: %s\n"
@@@ -1352,7 -1035,6 +1347,7 @@@ msgstr "オプション\"%.50s\"はあ�
msgid "command \"%.50s\" is ambiguous\n"
msgstr "コマンド\"%.50s\"はあいまいです\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
msgid "out of core\n"
msgstr "メモリがありません\n"
@@@ -1410,8 -1081,6 +1405,8 @@@ msgstr "lock '%s' は作成されませ
msgid "waiting for lock %s...\n"
msgstr "lock %s を待ちます...\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s が古すぎます (%s が必要、現在 %s)\n"
@@@ -1582,8 -1214,6 +1577,8 @@@ msgstr "OpenPGPカードが利用でき
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGPカードno. %sを検出\n"
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
msgid "can't do this in batch mode\n"
msgstr "これはバッチ・モードではできません\n"
@@@ -1595,10 -1223,6 +1590,10 @@@ msgstr "このコマンドが使える�
msgid "Reset Code not or not anymore available\n"
msgstr "リセット・コードが(もはや)利用可能ではありません\n"
+#: g10/card-util.c:142 g10/card-util.c:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "あなたの選択は? "
@@@ -1655,16 -1266,10 +1650,16 @@@ msgstr "エラー: つないだ名前�
msgid "URL to retrieve public key: "
msgstr "公開鍵を取得するURL: "
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, c-format
msgid "error reading '%s': %s\n"
msgstr "'%s'の読み込みエラー: %s\n"
- #: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "'%s'の書き込みエラー: %s\n"
@@@ -1714,7 -1308,6 +1709,7 @@@ msgstr "鍵は操作できません: %s
msgid "not an OpenPGP card"
msgstr "OpenPGPカードでありません"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, c-format
msgid "error getting current key info: %s\n"
msgstr "現行鍵情報の取得エラー: %s\n"
@@@ -1748,19 -1336,15 +1743,19 @@@ msgstr "暗号化鍵の鍵長は? (%u)
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "認証鍵の鍵長は? (%u) "
+#: g10/card-util.c:1358
- #, fuzzy, c-format
- #| msgid "The card will now be re-configured to generate a key of %u bits\n"
+ #, c-format
msgid "The card will now be re-configured to generate a key of type: %s\n"
- msgstr "今、%uビットの鍵を生成するようにカードは再コンフィグされました\n"
+ msgstr ""
+ "カードは、今、こちらのタイプの鍵を生成するように再コンフィグされました: %s\n"
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "%uビットに切り上げます\n"
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 鍵長は %u-%u の範囲でなければなりません\n"
@@@ -1814,9 -1388,6 +1809,9 @@@ msgstr " (2) 暗号化鍵\n
msgid " (3) Authentication key\n"
msgstr " (3) 認証鍵\n"
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "無効な選択です。\n"
@@@ -1942,22 -1483,14 +1937,22 @@@ msgstr "このコマンドで--output�
msgid "can't open '%s'\n"
msgstr "'%s'が開けません\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "鍵ブロックの読み込みエラー: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, c-format
msgid "key \"%s\" not found\n"
msgstr "鍵\"%s\"が見つかりません\n"
@@@ -2045,8 -1560,6 +2040,8 @@@ msgid "
msgstr ""
"*警告*: 共通鍵暗号方式 %s (%d) の強制が、受取人の優先指定をそむきます\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, c-format
msgid "cipher algorithm '%s' may not be used in %s mode\n"
msgstr "暗号アルゴリズム'%s'を%sモードで使うことはできません\n"
@@@ -2074,7 -1583,6 +2069,7 @@@ msgstr "共通鍵暗号方式 %s (%d) �
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s暗号化 受信者:\"%s\"\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, c-format
msgid "option '%s' may not be used in %s mode\n"
msgstr "オプション'%s'を%sモードで使うことはできません\n"
@@@ -2186,26 -1670,20 +2181,26 @@@ msgstr " - スキップされました
msgid "writing to '%s'\n"
msgstr "'%s'への書き込み\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "鍵%s: 鍵はカード上にあります - スキップします\n"
- #: g10/export.c:1904
++#: g10/export.c:1909
msgid "exporting secret keys not allowed\n"
msgstr "秘密鍵のエクスポートは認められません\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "鍵%s: PGP 2.x形式の鍵です - スキップします\n"
- #: g10/export.c:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "*警告*: 何もエクスポートされていません\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2214,13 -1691,10 +2209,13 @@@
msgid "[User ID not found]"
msgstr "[ユーザIDが見つかりません]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(オプション'%s'の引数を確認ください)\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr "警告: '%s'は長い鍵IDかフィンガープリントであるべきです。\n"
@@@ -2230,56 -1703,45 +2225,56 @@@
msgid "error looking up: %s\n"
msgstr "検索のエラー: %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, c-format
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "警告: %sは鍵リングに%d回出現します\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "'%s'を %s から自動取得\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "'%s'を %s から取得する際のエラー: %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
msgid "No fingerprint"
msgstr "フィンガープリントがありません"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "秘密鍵\"%s\"が見つかりません: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, c-format
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "警告: デフォルトの秘密鍵として '%s' を用いません: %s\n"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, c-format
msgid "using \"%s\" as default secret key for signing\n"
msgstr "デフォルトの署名用の秘密鍵として\"%s\"を用います\n"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr "'%s'に渡されたすべての値は無視されました\n"
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uidで有効にされた無効な鍵%sです\n"
- #: g10/getkey.c:3716
++#: g10/getkey.c:3724
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "副鍵%s(主鍵%sではなく)を用います\n"
- #: g10/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, c-format
msgid "valid values for option '%s':\n"
msgstr "オプション'%s'に有効な値:\n"
@@@ -2468,7 -1884,6 +2463,7 @@@ msgstr "正準テキスト・モード�
msgid "|FILE|write output to FILE"
msgstr "|FILE|出力をFILEに書き出す"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "無変更"
@@@ -2828,7 -2170,6 +2823,7 @@@ msgstr "%s:%d: 無効な auto-key-locat
msgid "invalid auto-key-locate list\n"
msgstr "無効な auto-key-locate リストです\n"
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "*警告*: プログラムはcoreファイルを作成することがあります!\n"
@@@ -2847,7 -2185,6 +2842,7 @@@ msgstr "%sは%sとともに使うこと
msgid "%s makes no sense with %s!\n"
msgstr "%sは%sとともに使っても無意味です!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr "*警告*: ニセモノのシステム時刻で実行しています: "
@@@ -2856,7 -2192,6 +2851,7 @@@
msgid "will not run with insecure memory due to %s\n"
msgstr "%s のため、セキュアでないメモリで実行しません\n"
- #: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "選択された暗号アルゴリズムは、無効です\n"
@@@ -2917,8 -2238,6 +2912,8 @@@ msgstr "無効な個人用圧縮の優�
msgid "%s does not yet work with %s\n"
msgstr "%sは%sではまだ機能しません\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 sm/sign.c:478 sm/verify.c:473
#, c-format
msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "ダイジェスト・アルゴリズム'%s'を%sモードで使うことはできません\n"
@@@ -3044,7 -2337,6 +3039,7 @@@ msgstr "|FILE|鍵リングFILEの鍵を
msgid "make timestamp conflicts only a warning"
msgstr "日時の矛盾を警告だけにします"
- #: g10/gpgv.c:84 sm/gpgsm.c:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|このFDにステイタス情報を書き出す"
@@@ -4328,7 -3346,6 +4323,7 @@@ msgstr "それでも追加したいで�
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "PGP2形式の鍵にはフォトIDを追加できません。\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr "そういったユーザIDはすでにこの鍵に存在しています!\n"
@@@ -4612,54 -3568,42 +4607,54 @@@ msgstr "ダイジェストの優先指�
msgid "too many compression preferences\n"
msgstr "圧縮の優先指定が多すぎます\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "優先指定の文字列に無効な項目'%s'があります\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "直接署名を書き込みます\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "自己署名を書き込みます\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "鍵対応への署名を書き込みます\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "無効な鍵長。%uビットにします\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "鍵長を%uビットに丸めます\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"*警告*: いくつかのOpenPGPプログラムはこのダイジェスト長のDSA鍵を扱うことがで"
"きません\n"
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
msgid "Sign"
msgstr "Sign"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr "Certify"
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
msgid "Encrypt"
msgstr "Encrypt"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr "Authenticate"
@@@ -4673,150 -3617,119 +4668,150 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr "鍵%sに認められた操作: "
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr "現在の認められた操作: "
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) 署名機能を反転する\n"
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) 暗号機能を反転する\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) 認証機能を反転する\n"
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) 完了\n"
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "ご希望の鍵の種類を選択してください:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA と RSA (デフォルト)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA と Elgamal\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (署名のみ)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (署名のみ)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (暗号化のみ)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (暗号化のみ)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (機能をあなた自身で設定)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (機能をあなた自身で設定)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) ECC と ECC\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, c-format
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) ECC (署名のみ)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) ECC (機能をあなた自身で設定)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, c-format
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) ECC (暗号化のみ)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) 既存の鍵\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
msgid "Enter the keygrip: "
msgstr "keygripを入力: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "有効なkeygrip (40桁の16進数字)ではありません\n"
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
msgid "No key with this keygrip\n"
msgstr "このkeygripの鍵はありません\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, c-format
msgid "rounded to %u bits\n"
msgstr "%uビットに切り上げます\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s 鍵は %u から %u ビットの長さで可能です。\n"
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "副鍵の鍵長は? (%u) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "鍵長は? (%u) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "要求された鍵長は%uビット\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
msgid "Please select which elliptic curve you want:\n"
msgstr "ご希望の楕円曲線を選択してください:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -4832,7 -3745,6 +4827,7 @@@ msgstr "
" <n>m = 鍵は n か月間で期限切れ\n"
" <n>y = 鍵は n 年間で期限切れ\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -4848,38 -3760,30 +4843,38 @@@ msgstr "
" <n>m = 署名は n か月間で期限切れ\n"
" <n>y = 署名は n 年間で期限切れ\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "鍵の有効期間は? (0)"
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "署名の有効期間は? (%s)"
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "無効な値\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
msgid "Key does not expire at all\n"
- msgstr "%sは無期限です\n"
+ msgstr "鍵は無期限です\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
msgid "Signature does not expire at all\n"
- msgstr "%署名は無期限です\n"
+ msgstr "署名は無期限です\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, c-format
msgid "Key expires at %s\n"
msgstr "鍵は%sで期限切れとなります\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, c-format
msgid "Signature expires at %s\n"
msgstr "署名は%sで期限切れとなります\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -4887,11 -3791,9 +4882,11 @@@ msgstr "
"このシステムでは、2038年以降の日付を表示することはできませんが、\n"
"2106年まで正しく処理されます。\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
msgid "Is this correct? (y/N) "
msgstr "これで正しいですか? (y/N) "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4905,7 -3807,6 +4900,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -4921,49 -3822,38 +4916,49 @@@ msgstr "
" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "本名: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "名前に無効な文字があります\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr "キャラクタ'%s'と'%s'は名前に使えません\n"
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "名前を数字で始めてはいけません\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "名前は5文字以上でなければなりません\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "電子メール・アドレス: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "有効な電子メール・アドレスではありません\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "コメント: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "コメントに無効な文字があります\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "あなたは文字集合'%s'を使っています。\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -4974,7 -3864,6 +4969,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "電子メールのアドレスを本名やコメントに入れないように\n"
@@@ -4989,31 -3878,24 +4984,31 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "名前(N)、コメント(C)、電子メール(E)の変更、または終了(Q)? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "名前(N)、コメント(C)、電子メール(E)の変更、またはOK(O)か終了(Q)? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "名前(N)、電子メール(E)の変更、または終了(Q)? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "名前(N)、電子メール(E)の変更、またはOK(O)か終了(Q)? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "まずエラーを修正してください\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
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"
@@@ -5024,13 -3906,10 +5019,13 @@@ msgstr "
"す、ディスクにアクセスするなどの他の操作を素数生成の間に行うことで、乱数生\n"
"成器に十分なエントロピーを供給する機会を与えることができます。\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "鍵の生成に失敗しました: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5041,62 -3920,49 +5036,62 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr "続けますか? (Y/n) "
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "\"%s\" の鍵はもうあります\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
msgid "Create anyway? (y/N) "
msgstr "それでも鍵を作成しますか? (y/N) "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
msgid "creating anyway\n"
msgstr "いずれにしろ鍵を作成\n"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr "注意: 全機能の鍵生成には \"%s %s\" を使います。\n"
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "鍵の生成が取り消されました。\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "バックアップ・ファイル'%s'が作成できません: %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "*注意*: カード鍵のバックアップが'%s'へ保存されます\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, c-format
msgid "writing public key to '%s'\n"
msgstr "'%s'へ公開鍵を書き込みます\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "書き込み可能な公開鍵リングが見つかりません: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "公開鍵リング'%s'の書き込みエラー: %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "公開鍵と秘密鍵を作成し、署名しました。\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
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"
@@@ -5104,31 -3970,25 +5099,31 @@@ msgstr "
"この鍵は暗号化には使用できないことに注意してください。暗号化を行うには、\n"
"\"--edit-key\"コマンドを使って副鍵を生成してください。\n"
- #: g10/keygen.c:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
- #: g10/keygen.c:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "*注意*: v3鍵に対する副鍵の作成は、OpenPGPに適合しません\n"
- #: g10/keygen.c:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
msgid "Secret parts of primary key are not available.\n"
msgstr "主鍵の秘密部分が利用できません。\n"
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主鍵の秘密部分はカード上に保存されています。\n"
- #: g10/keygen.c:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
msgid "Really create? (y/N) "
msgstr "本当に作成しますか? (y/N) "
@@@ -5835,23 -4549,18 +5830,23 @@@ msgstr "この写真は正しいです�
msgid "unable to display photo ID!\n"
msgstr "フォトIDが表示不能!\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "理由は指定されていません"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "鍵がとりかわっています"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "鍵(の信頼性)が損なわれています"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "鍵はもはや使われていません"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "ユーザIDがもはや有効でありません"
@@@ -5926,7 -4622,6 +5921,7 @@@ msgid "
"\n"
msgstr "この鍵の最小信用レベル: %s\n"
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "あなたの決定は? "
@@@ -6061,46 -4728,37 +6056,46 @@@ msgstr "*警告*: この鍵は十分に
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " この署名が所有者のものかどうか確信できません。\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: スキップ: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: スキップ: 公開鍵は使用禁止です\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: スキップ: 公開鍵はもうあります\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, c-format
msgid "can't encrypt to '%s'\n"
msgstr "'%s'に暗号化できません\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr ""
"オプション'%s'が与えられましたが、有効なデフォルト鍵が与えられていません\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "オプション'%s'が与えられましたが、オプション'%s'は与えられていません\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "ユーザIDを指定していません (\"-r\"を使いましょう) 。\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr "今の受取人:\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6108,37 -4766,29 +6103,37 @@@ msgstr "
"\n"
"ユーザIDを入力。空行で終了: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "そのユーザIDはありません。\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "スキップ: 公開鍵はデフォルトの受取人としてもう設定済みです\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "公開鍵は使用禁止です。\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "スキップ: 公開鍵はもう設定済みです\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "デフォルトの受取人\"%s\"が不明です\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "有効な宛先がありません\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "*注意*: 鍵%sには %s の機能がありません\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "*注意*: 鍵%sには%sに対する優先指定がありません\n"
@@@ -6238,7 -4866,6 +6233,7 @@@ msgstr "秘密鍵が利用できませ�
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "この鍵に対する指名失効証明書を作成しますか? (y/N) "
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "ASCII外装出力を強制します。\n"
@@@ -6256,11 -4880,9 +6251,11 @@@ msgstr "失効証明書を作成。\n
msgid "no revocation keys found for \"%s\"\n"
msgstr "\"%s\"用の失効鍵が見つかりません\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "これは失効証明書でこちらのOpenPGP鍵に対するものです:"
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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"
@@@ -6270,7 -4892,6 +6265,7 @@@ msgstr "
"ように公に宣言するものです。一度発行されると、そのような失効証明書は\n"
"撤回することはできません。"
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6283,7 -4904,6 +6278,7 @@@ msgstr "
"失効の理由をつける方がよいでしょう。詳細は、GnuPGマニュアルのgpgコマンド \"--"
"generate-revocation\"の記述をご覧ください。"
- #: g10/revoke.c:577
++#: g10/revoke.c:590
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"
@@@ -6293,12 -4913,10 +6288,12 @@@ msgstr "
"の前に挿入されます。この失効証明書をインポートして公開する前に、テク\n"
"スト・エディタでこのコロンを削除してください。"
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, c-format
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "失効証明書を '%s.rev' に保管しました。\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, c-format
msgid "secret key \"%s\" not found\n"
msgstr "秘密鍵\"%s\"が見つかりません\n"
@@@ -6306,21 -4924,17 +6301,21 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr "'%s'は以下の複数の秘密鍵にマッチします:\n"
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, c-format
msgid "error searching the keyring: %s\n"
msgstr "鍵リング探索エラー: %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "この鍵に対する失効証明書を作成しますか? (y/N) "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6341,33 -4955,26 +6336,33 @@@ msgstr "
"る\n"
"場所にデータをおくことがあります!\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "失効の理由を選択してください:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "キャンセル"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(ここではたぶん%dを選びたいでしょう)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "予備の説明を入力。空行で終了:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "失効理由: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(説明はありません)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
msgid "Is this okay? (y/N) "
msgstr "よろしいですか? (y/N) "
@@@ -6743,10 -5276,6 +6738,10 @@@ msgstr "'ultimately_trusted_keys' TOFU�
msgid "TOFU DB error"
msgstr "TOFU DBエラー"
+#: 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
++#: g10/tofu.c:3408
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "TOFUデータベースの読み込みエラー: %s\n"
@@@ -6776,7 -5300,6 +6771,7 @@@ msgstr "バインディングDBにカ�
msgid "error opening TOFU database '%s': %s\n"
msgstr "TOFUデータベースのオープンでエラー '%s': %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "TOFUデータベースの更新エラー: %s\n"
@@@ -7066,19 -5540,15 +7061,19 @@@ msgstr[0] "
" %s\n"
"でダメとマークしてください。\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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "TOFUデータベースのオープンでエラー: %s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
"*警告*: %s に暗号化します。失効していないユーザIDが一つもないものです\n"
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, c-format
msgid "error setting policy for key %s, user id \"%s\": %s"
msgstr "鍵%s, ユーザID \"%s\"のポリシーの設定エラー: %s"
@@@ -7140,7 -5598,6 +7135,7 @@@ msgstr "%s信用モデルを使用\n
msgid "no need for a trustdb check\n"
msgstr "信用データベースの検査は、不要です\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "次回の信用データベース検査は、%sです\n"
@@@ -7168,34 -5620,28 +7163,34 @@@ msgstr "--check-trustdbを実行して�
msgid "checking the trustdb\n"
msgstr "信用データベースの検査\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "%d個の鍵を処理"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, c-format
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
msgstr[0] " (うち%d本の有効性数をクリア)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "究極的に信用する鍵が見つかりません\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "究極的に信用する鍵%sの公開鍵が見つかりません\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr "深さ: %d 有効性: %3d 署名: %3d 信用: %d-, %dq, %dn, %dm, %df, %du\n"
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -7604,55 -5964,42 +7599,55 @@@ msgstr "||PINをリーダのピンパ�
msgid "|N|Initial New PIN"
msgstr "|N|初期の新しいPIN"
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr "マルチ・サーバ・モード(フォアグラウンド)で実行"
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|デバッグ・レベルをLEVELとします"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
msgid "|FILE|write a log to FILE"
msgstr "|FILE|FILEにログを書き出します"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr "|N|ポートNのリーダに接続します"
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NAME|ct-APIドライバとしてNAMEを用います"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NAME|PC/SCドライバとしてNAMEを用います"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
msgid "do not use the internal CCID driver"
msgstr "内蔵CCIDドライバを使いません"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr "|N|N秒アクティブでない場合、カードへの接続を切ります"
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr "リーダのピンパッドを使わない"
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
msgid "deny the use of admin card commands"
msgstr "管理カード・コマンドの使用を拒否"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr "ピンパッドの可変長入力を使う"
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "使い方: @SCDAEMON@ [オプション] (ヘルプは -h)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
@@@ -7660,18 -6007,15 +7655,18 @@@ msgstr "
"形式: scdaemon [オプション] [コマンド [引数]]\n"
"@GNUPG@のSmartcardデーモン\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
"'--daemon'オプションを使って、プログラムをバックグラウンドで実行してくださ"
"い\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr "fd %dのハンドラが開始されました\n"
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "fd %dのハンドラが終了しました\n"
@@@ -8354,7 -6545,6 +8349,7 @@@ msgstr "|FILE|鍵リングを鍵リン�
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|USER-ID|USER-IDをデフォルトの秘密鍵として使う"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|このキーサーバを鍵の検索に使う"
@@@ -8409,17 -6589,14 +8404,17 @@@ msgstr "%s:%u: この行はスキップ
msgid "could not parse keyserver\n"
msgstr "鍵サーバのURLを解析不能\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "共通証明書のインポート・エラー: %s\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "'%s'を用いて署名できません: %s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr "無効なコマンド (暗黙のコマンドはありません)\n"
@@@ -9349,112 -7336,84 +9344,112 @@@ msgstr "絶対ファイル名がきま�
msgid "looking up '%s'\n"
msgstr "'%s'を検索します\n"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr "CRLキャッシュの内容をリストします"
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|FILEからCRLをキャッシュにロードする"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|URLからCRLを取得します"
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr "dirmngrをシャットダウンする"
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr "キャッシュをフラッシュします"
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr "|FILE|FILEにサーバ・モードのログを書き出す"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
msgid "run without asking a user"
msgstr "ユーザに問い合わせせずに実行"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr "期日の過ぎたCRLのロードを強制する"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr "OCSP要求の送信を認める"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr "オンラインのソフトウェア・バージョン・チェックを許す"
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr "HTTPの使用を禁止する"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr "LDAPの使用を禁止する"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr "HTTP CRL配布ポイントを無視する"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr "LDAP CRL配布ポイントを無視する"
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr "OCSPサービスURLに入っている証明書を無視する"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|すべてのHTTPリクエストをURLにリダイレクトする"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HOST|LDAPの問い合わせにHOSTを使う"
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "--ldap-proxy にフォールバック・ホストを使わない"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|FILEからLDAPサーバリストを読み込みます"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr "CRL配布ポイントに発見された新しいサーバを serverlist に追加する"
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|LDAPのタイムアウトをN秒とする"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|OCSP応答としてURLを使用"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|FPRで署名されたOCSPレスポンス"
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr "|N|一つのクエリでNを越えるのアイテムを返さない"
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr "|FILE|FILEにあるCA証明書をTLSでのHKPに使う"
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr "ネットワーク・トラフィックをすべてTor経由にする"
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9463,11 -7422,9 +9458,11 @@@ msgstr "
"@\n"
"(コマンドとオプション全部の一覧は、\"info\" マニュアルをご覧ください)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "使い方: @DIRMNGR@ [オプション] (ヘルプは -h)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9475,77 -7432,60 +9470,77 @@@ msgstr "
"形式: @DIRMNGR@ [オプション] [コマンド [引数]]\n"
"@GnuPG@の鍵サーバ、CRLとOCSPアクセス\n"
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "有効なdebugレベルは: %s\n"
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, c-format
msgid "usage: %s [options] "
msgstr "使い方: %s [オプション] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
msgid "colons are not allowed in the socket name\n"
msgstr "コロンはソケット名に許されません\n"
- #: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "'%s'からCRLの取得の失敗: %s\n"
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "'%s'からCRLの処理に失敗: %s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: 行が長すぎます - スキップされました\n"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: 無効なフィンガープリントが検出されました\n"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: 読み込みエラー: %s\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: 行末のゴミを無視\n"
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr "SIGHUPを受け取り - 設定を読み直し、キャッシュをフラッシュ\n"
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr "SIGUSR2を受け取り - 動作は定義されない\n"
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr "SIGTERMを受け取り - シャットダウン...\n"
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "SIGTERMを受け取り - %d本のアクティブな接続がまだあります\n"
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
msgid "shutdown forced\n"
msgstr "強制的にシャットダウンする\n"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr "SIGINTを受け取り - すぐにシャットダウン\n"
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "シグナル%dを受け取り - アクションは定義されない\n"
@@@ -9970,76 -7819,60 +9965,76 @@@ msgstr "OSCPレスポンダは現在で
msgid "OCSP responder returned an too old status\n"
msgstr "OSCPレスポンダは古すぎるステイタスを返しました\n"
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assuan_inquire(%s)が失敗しました: %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr "ldapserverがありません"
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr "serialnoがcert IDにありません"
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assuan_inquireに失敗しました: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fetch_cert_by_url が失敗しました: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, c-format
msgid "error sending data: %s\n"
msgstr "データ送信エラー: %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "start_cert_fetch が失敗しました: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fetch_next_cert が失敗しました: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d を越えました\n"
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "制御構造を確保できません: %s\n"
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "assuanコンテクストの確保に失敗しました: %s\n"
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "サーバの初期化に失敗しました: %s\n"
- #: dirmngr/server.c:2632
++#: dirmngr/server.c:2738
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "Assuanで登録コマンドに失敗しました: %s\n"
- #: dirmngr/server.c:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan accept の問題: %s\n"
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuanの処理が失敗しました: %s\n"
@@@ -10077,7 -7902,6 +10072,7 @@@ msgstr "証明書チェインは正し�
msgid "certificate should not have been used for CRL signing\n"
msgstr "証明書はCRL署名のために使われるべきではありませんでした\n"
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
msgid "quiet"
msgstr "おとなしく"
@@@ -10168,258 -7972,193 +10163,258 @@@ msgstr "行の送信に失敗しまし�
msgid "error sending standard options: %s\n"
msgstr "標準オプションを送信エラー: %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr "診断出力を制御するオプション"
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr "コンフィグレーションを制御するオプション"
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr "デバッグのために有用なオプション"
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr "セキュリティを制御するオプション"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|N秒後にSSH鍵を無効とする"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|最大PINキャッシュ存続時間をN秒とする"
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|最大SSH鍵存続時間をN秒とする"
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr "パスワード・ポリシーの強制オプション"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr "パスワード・ポリシーを迂回することを認めない"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|新しいパスフレーズの必要とする最低長をNとする"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
"|N|新しいパスフレーズとしてアルファベットでないキャラクタを最低N必要とする"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|FILE|新しいパスフレーズをFILEのパターンに対してチェックする"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
msgid "|N|expire the passphrase after N days"
msgstr "|N|N日後にパスフレーズを期限切れとする"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
msgid "do not allow the reuse of old passphrases"
msgstr "古いパスフレーズを再使用することを認めない"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|PinentryのタイムアウトをN秒とする"
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|デフォルトの秘密鍵としてNAMEを用いる"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAME|ユーザID NAMEにも暗号化する"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|電子メールエイリアスを設定する"
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr "キーサーバのコンフィグレーション"
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
msgid "|URL|use keyserver at URL"
msgstr "|URL|鍵サーバとしてURLを使用"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr "PKA検索(DNS要求)を認める"
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr "|MECHANISMS|メールアドレスによって鍵を特定する際、MECHANISMSを使用する"
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr "dirmngrへのすべてのアクセスを無効とする"
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAME|PKCS#12のパスフレーズにNAMEのエンコーディングを使う"
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr "ルート証明書のCRLをチェックしない"
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr "出力フォーマットを制御するオプション"
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr "インタラクティビティと強制を制御するオプション"
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
msgstr "Torの使用を制御するオプション"
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr "HTTPサーバのコンフィグレーション"
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr "システムのHTTPプロキシ設定を用います"
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr "使用するLDAPサーバのコンフィグレーション"
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr "LDAPサーバ・リスト"
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr "OCSPのコンフィグレーション"
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr "OpenPGP"
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr "プライベート鍵"
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr "スマートカード"
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr "S/MIME"
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
msgid "Network"
msgstr "ネットワーク"
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
msgid "Passphrase Entry"
msgstr "パスフレーズ入力"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
msgid "Component not suitable for launching"
msgstr "コンポーネントが起動するために適切ではありません"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr "コンポーネント%sの外部の検証が失敗しました"
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr "グループ仕様は無視されていることに注意してください\n"
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, c-format
msgid "error closing '%s'\n"
msgstr "'%s'でクローズのエラー\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, c-format
msgid "error parsing '%s'\n"
msgstr "'%s'でパーズのエラー\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr "すべてのコンポーネントをリストする"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr "すべてのプログラムをチェックする"
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr "|COMPONENT|オプションをリストする"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr "|COMPONENT|オプションを変更する"
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr "|COMPONENT|オプションをチェックする"
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr "グローバル・デフォルト値を適用する"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
msgstr "|FILE|FILEを使ってコンフィグレーション・ファイルを更新する"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr "@GPGCONF@のためにコンフィグレーション・ディレクトリを取得する"
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
msgid "list global configuration file"
msgstr "グローバルのコンフィグレーション・ファイルをリストする"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
msgid "check global configuration file"
msgstr "グローバルのコンフィグレーション・ファイルをチェックする"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
msgid "query the software version database"
msgstr "ソフトウェア・バージョン・データベースに問い合わせる"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr "すべて、あるいは指定されたコンポーネントをリロードする"
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr "指定されたコンポーネントを起動する"
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr "指定されたコンポーネントをkillする"
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "出力ファイルとして使用"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr "可能な場合、実行時に変更を有効とする"
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "使い方: @GPGCONF@ [オプション] (ヘルプは -h)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10427,15 -8166,12 +10422,15 @@@ msgstr "
"形式: @GPGCONF@ [オプション]\n"
"@GNUPG@システムのツールに対しコンフィグレーション・オプションを管理する\n"
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr "一つコンポーネント引数が必要です"
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
msgid "Component not found"
msgstr "コンポーネントが見つかりません"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
msgid "No argument allowed"
msgstr "引数は許可されていません"
diff --cc po/nb.po
index 1c9e97b,eea3fd7..6330b90
--- a/po/nb.po
+++ b/po/nb.po
@@@ -11,7 -11,6 +11,7 @@@ msgid "
msgstr ""
"Project-Id-Version: GNU gnupg 2.1\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2017-11-02 17:40+0100\n"
"Last-Translator: Åka Sikrom <a4 at hush.com>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@@ -158,25 -129,10 +158,25 @@@ msgstr "Ugyldig passordfrase
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh-nøkler som er lenger enn %d bit støttes ikke\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, c-format
msgid "can't open '%s': %s\n"
msgstr "klarte ikke å åpne «%s»: %s\n"
@@@ -374,8 -291,6 +374,8 @@@ msgstr "Skriv inn passordfrase for å%0
msgid "Please enter the new passphrase"
msgstr "Skriv inn ny passordfrase"
- #: agent/gpg-agent.c:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -383,132 -298,93 +383,132 @@@ msgstr "
"@Valg:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr "kjør som bakgrunnsprosess («daemon»)"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr "kjør i tjenermodus (forgrunn)"
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
msgid "run in supervised mode"
msgstr "kjør i «supervised» modus"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "detaljert utskrift"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "være noenlunde stille"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr "sh-utdata for kommandoer"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr "csh-utdata for kommandoer"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|FIL|les valg fra valgt FIL"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr "ikke løsne fra konsoll"
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "bruk loggfil for tjeneren"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|bruk PGM til inntasting av PIN-koder"
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|bruk PGN som SCdaemon-program"
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
msgid "do not use the SCdaemon"
msgstr "ikke bruk SCdaemon"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|godta enkelte kommandoer via «NAME»"
- #: agent/gpg-agent.c:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr "ignorer forespørsler om å bytte TTY"
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr "ignorer forespørsler om å bytte X-skjerm"
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|fjern hurtiglagrede PIN-koder etter N sekunder"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr "ikke bruk PIN-hurtiglager under signering"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
msgid "disallow the use of an external password cache"
msgstr "ikke tillat bruk av eksternt passord-hurtiglager"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr "ikke la klienter tillitsmarkere nøkler"
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
msgid "allow presetting passphrase"
msgstr "tillat valg av passordfrase på forhånd"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr "ikke la kaller overstyre PIN-inntasting"
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr "la brukeren skrive inn passordfrase via Emacs"
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
msgid "enable ssh support"
msgstr "slå på ssh-støtte"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr "|ALGO|bruk valgt ALGOritme til å vise ssh-fingeravtrykk"
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
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:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Bruk: @GPG_AGENT@ [valg] («-h» for hjelp)"
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -516,140 -392,99 +516,135 @@@ msgstr "
"Syntaks: @GPG_AGENT@ [valg] [kommando [arg]]\n"
"Håndtering av hemmelige nøkler for @GNUPG@\n"
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "«%s» er et ugyldig feilsøkingsnivå\n"
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "valg kontrollsum-algoritme er ugyldig\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "Merk: standardvalg-fil «%s» finnes ikke\n"
- #: agent/gpg-agent.c:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "valgfil «%s»: %s\n"
- #: agent/gpg-agent.c:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, c-format
msgid "reading options from '%s'\n"
msgstr "leser valg fra «%s»\n"
- #: agent/gpg-agent.c:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Merk: «%s» regnes ikke som et valg\n"
- #: agent/gpg-agent.c:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, c-format
msgid "can't create socket: %s\n"
msgstr "klarte ikke å lage sokkel: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "sokkelnavnet «%s» er for langt\n"
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
msgid "error getting nonce for the socket\n"
msgstr "feil under henting av sokkel-anledning\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "feil under knytning av sokkel til «%s»: %s\n"
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "klarte ikke å endre tillatelser til «%s»: %s\n"
- #: agent/gpg-agent.c:2241 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
- #, c-format
- msgid "listen() failed: %s\n"
- msgstr "listen() mislyktes: %s\n"
-
- #: agent/gpg-agent.c:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, c-format
msgid "listening on socket '%s'\n"
msgstr "lytter på sokkel «%s»\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "stat() mislyktes for «%s»: %s\n"
- #: agent/gpg-agent.c:2327
++#: agent/gpg-agent.c:2351
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "«%s» kan ikke brukes som hjemmemappe\n"
- #: agent/gpg-agent.c:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, 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:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "startet behandler 0x%lx for fd %d\n"
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "avsluttet behandler 0x%lx for fd %d\n"
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, 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:2771
++#: agent/gpg-agent.c:2795
#, 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:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_pselect mislyktes: %s - venter 1s\n"
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppet\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
@@@ -665,8 -498,6 +660,8 @@@ msgstr "
"Syntaks: gpg-preset-passphrase [valg] KEYGRIP\n"
"Vedlikehold av hurtiglager for passord\n"
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -674,9 -505,6 +669,9 @@@ msgstr "
"@Kommandoer:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -730,8 -550,6 +725,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:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, c-format
msgid "error opening '%s': %s\n"
msgstr "feil under åpning av «%s»: %s\n"
@@@ -918,8 -701,6 +913,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, c-format
msgid "error forking process: %s\n"
msgstr "feil under kopiering av prosess: %s\n"
@@@ -1356,7 -1039,6 +1351,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:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
msgid "out of core\n"
msgstr "kjernen er full\n"
@@@ -1414,8 -1085,6 +1409,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:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s er for gammel (krever %s, har %s)\n"
@@@ -1585,8 -1217,6 +1580,8 @@@ msgstr "OpenPGP-kort er ikke tilgjengel
msgid "OpenPGP card no. %s detected\n"
msgstr "Oppdaget OpenPGP-kortnummer %s\n"
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
msgid "can't do this in batch mode\n"
msgstr "du kan ikke gjøres dette i buntmodus\n"
@@@ -1598,10 -1226,6 +1593,10 @@@ msgstr "Denne kommandoen er bare tilgje
msgid "Reset Code not or not anymore available\n"
msgstr "Tilbakestillingskode er ikke tilgjengelig\n"
+#: g10/card-util.c:142 g10/card-util.c:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Ditt valg? "
@@@ -1658,16 -1269,10 +1653,16 @@@ msgstr "Feil: Det kombinerte navnet er
msgid "URL to retrieve public key: "
msgstr "Adresse for henting av offentlig nøkkel: "
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, c-format
msgid "error reading '%s': %s\n"
msgstr "feil under lesing av «%s»: %s\n"
- #: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "feil under skriving av «%s»: %s\n"
@@@ -1717,7 -1311,6 +1712,7 @@@ msgstr "klarte ikke å utføre nøkkelh
msgid "not an OpenPGP card"
msgstr "ikke et OpenPGP-kort"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, c-format
msgid "error getting current key info: %s\n"
msgstr "feil under henting av nøkkelinfo: %s\n"
@@@ -1757,13 -1344,10 +1752,13 @@@ msgstr "Hvor stor skal autentiseringsn�
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr "Kortet blir nå satt opp på nytt for å lage nøkkel på %u bit\n"
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: 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:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 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"
@@@ -1817,9 -1391,6 +1812,9 @@@ msgstr " (2) Krypteringsnøkkel\n
msgid " (3) Authentication key\n"
msgstr " (3) Autentiseringsnøkkel\n"
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Ugyldig valg.\n"
@@@ -1945,22 -1486,14 +1940,22 @@@ msgstr "«--output» virker ikke med de
msgid "can't open '%s'\n"
msgstr "klarte ikke å åpne «%s»\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "feil under lesing av nøkkelblokk: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, c-format
msgid "key \"%s\" not found\n"
msgstr "fant ikke nøkkelen «%s»\n"
@@@ -2050,8 -1565,6 +2045,8 @@@ msgstr "
"ADVARSEL: tvungen bruk av symmetrisk krypt.metode %s (%d) bryter med "
"mottakers oppsett\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, c-format
msgid "cipher algorithm '%s' may not be used in %s mode\n"
msgstr "du kan ikke bruke algoritme «%s» i %s-modus\n"
@@@ -2080,7 -1589,6 +2075,7 @@@ msgstr "tvungen bruk av krypt.metode %
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s kryptert for: «%s»\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, c-format
msgid "option '%s' may not be used in %s mode\n"
msgstr "du kan ikke bruke valget «%s» i %s-modus\n"
@@@ -2194,26 -1678,20 +2189,26 @@@ msgstr ". Hoppet over
msgid "writing to '%s'\n"
msgstr "skriver til «%s»\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, 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:1904
++#: g10/export.c:1909
msgid "exporting secret keys not allowed\n"
msgstr "eksportering av hemmelige nøkler er ikke tillatt\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "ADVARSEL: ingenting eksportert\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2222,13 -1699,10 +2217,13 @@@
msgid "[User ID not found]"
msgstr "[Fant ikke bruker-ID]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(kontroller argument for valget «%s»)\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr "Advarsel: «%s» må være en lang nøkkel-ID eller et fingeravtrykk\n"
@@@ -2238,56 -1711,45 +2233,56 @@@
msgid "error looking up: %s\n"
msgstr "feil under oppslag av %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, c-format
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "Advarsel: %s står oppført på nøkkelknippet %d ganger\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "hentet «%s» via %s automatisk\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "feil under henting av «%s» via %s: %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
msgid "No fingerprint"
msgstr "Ingen fingeravtrykk"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "fant ikke hemmelig nøkkel «%s»: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, c-format
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "Advarsel: bruker ikke «%s» som forvalgt nøkkel: %s\n"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, c-format
msgid "using \"%s\" as default secret key for signing\n"
msgstr "bruker «%s» som forvalgt hemmelig signeringsnøkkel\n"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr "alle verdier som sendes til «%s» blir ignorert\n"
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, 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/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, c-format
msgid "valid values for option '%s':\n"
msgstr "følgende verdier er gyldige for «%s»:\n"
@@@ -2476,7 -1892,6 +2471,7 @@@ msgstr "bruk kanonisk tekstmodus
msgid "|FILE|write output to FILE"
msgstr "|FILE|skriv utdata til valgt FIL"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "ikke utfør valgte endringer"
@@@ -2834,7 -2176,6 +2829,7 @@@ msgstr "%s:%d: ugyldig «auto-key-locat
msgid "invalid auto-key-locate list\n"
msgstr "ugyldig «auto-key-locate»-liste\n"
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "ADVARSEL: programmet kan lage en kjernefil.\n"
@@@ -2853,7 -2191,6 +2848,7 @@@ msgstr "du kan ikke bruke %s med %s.\n
msgid "%s makes no sense with %s!\n"
msgstr "%s gir ikke mening med %s.\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr "ADVARSEL: kjører med falsk systemtid: "
@@@ -2862,7 -2198,6 +2857,7 @@@
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:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt krypteringsalgoritme er ugyldig\n"
@@@ -2923,8 -2244,6 +2918,8 @@@ msgstr "ugyldig personlig oppsett av ko
msgid "%s does not yet work with %s\n"
msgstr "%s virker ikke enda med %s\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 sm/sign.c:478 sm/verify.c:473
#, c-format
msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "du kan ikke bruke algoritme «%s» i %s-modus\n"
@@@ -3052,7 -2345,6 +3047,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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|skrive statusinfo til denne FD"
@@@ -4358,7 -3376,6 +4353,7 @@@ msgstr "Er du sikker på at du vil legg
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Du kan ikke knytte foto-ID til PGP2-nøkler.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr "Valgt bruker-ID finnes allerede på denne nøkkelen!\n"
@@@ -4647,54 -3603,42 +4642,54 @@@ msgstr "for mange kontrollsum-innstilli
msgid "too many compression preferences\n"
msgstr "for mange komprimeringsinnstillinger\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "«%s» er et ugyldig oppsettsvalg\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "skriver direkte signatur\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "skriver selvsignatur\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "skriver nøkkelbindende signatur\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "ugyldig nøkkelstørrelse. Bruker %u bit\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "nøkkelstørrelse rundet opp til %u bit\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"ADVARSEL: noen OpenPGP-programmer klarer ikke å behandle DSA-nøkler med "
"denne kontrollsum-størrelsen\n"
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
msgid "Sign"
msgstr "Signere"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr "Bekrefte"
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
msgid "Encrypt"
msgstr "Kryptere data"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr "Autentisere"
@@@ -4712,150 -3656,119 +4707,150 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr "SsKkAaQq"
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Mulige handlinger med en %s-nøkkel: "
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr "Tillatte handlinger: "
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Slå av/på signeringsfunksjon\n"
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Slå av/på krypteringsfunksjon\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Slå av/på autentiseringsfunksjon\n"
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Ferdig\n"
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Velg hvilken type nøkkel du vil ha:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA og RSA (standard)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA og Elgamal\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (bare signering)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (bare signering)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (bare kryptering)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (bare kryptering)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (sette dine egne muligheter)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (sette dine egne muligheter)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) ECC og ECC\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, c-format
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) ECC (kun signering)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) ECC (velg funksjoner selv)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, c-format
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) ECC (kun kryptering)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) Nøkkel\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
msgid "Enter the keygrip: "
msgstr "Skriv inn nøkkelgrep: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "Ugyldig nøkkelgrep (forventer 40 heks-sifre)\n"
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
msgid "No key with this keygrip\n"
msgstr "Ingen nøkkel med dette nøkkelgrepet\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, c-format
msgid "rounded to %u bits\n"
msgstr "rundet av til %u bit\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s-nøkler må være mellom %u og %u bit lange.\n"
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Hvor stor vil du at undernøkkelen skal være? (%u) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Hvor stor skal nøkkelen være? (%u) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Forespurt nøkkelstørrelse er %u bit\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
msgid "Please select which elliptic curve you want:\n"
msgstr "Velg elliptisk kurve:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -4871,7 -3784,6 +4866,7 @@@ msgstr "
" <n>m = nøkkelen utgår om n months\n"
" <n>y = nøkkelen utgår om n years\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -4887,38 -3799,30 +4882,38 @@@ msgstr "
" <n>m = signaturen utgår om n months\n"
" <n>y = signaturen utgår om n years\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "Nøkkelen er gyldig for? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Signaturen er gyldig for? (%s) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "ugyldig verdi\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
msgid "Key does not expire at all\n"
msgstr "Nøkkel utgår ikke i det hele tatt\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
msgid "Signature does not expire at all\n"
msgstr "Signaturen utgår ikke i det hele tatt\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, c-format
msgid "Key expires at %s\n"
msgstr "Nøkkel utgår %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, c-format
msgid "Signature expires at %s\n"
msgstr "Signaturen utgår %s\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -4926,11 -3830,9 +4921,11 @@@ msgstr "
"Systemet ditt klarer ikke å håndtere datoer etter 2038.\n"
"Likevel håndteres det korrekt fram til 2106.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
msgid "Is this correct? (y/N) "
msgstr "Er dette korrekt (j/N)? "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4944,7 -3846,6 +4939,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -4960,49 -3861,38 +4955,49 @@@ msgstr "
" «Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>»\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Fullt navn: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Ugyldig tegn i navn\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr "Tegnene «%s» og «%s» kan ikke brukes i navn\n"
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "Navn kan ikke begynne med siffer\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "Navnet må bestå av minst 5 tegn\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "E-postadresse: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "Ugyldig e-postadresse\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Kommentar: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Ugyldig tegn i kommentar\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "Du bruker tegnsettet «%s».\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5013,7 -3903,6 +5008,7 @@@ msgstr "
" «%s»\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Ikk bruk e-postadresse som navn eller kommentar\n"
@@@ -5028,31 -3917,24 +5023,31 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnKeEeRrAa"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Endre (N)avn, (E)postadresse eller (A)vslutt? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Endre (N)avn, (E)postadresse eller (R)iktig/(A)vslutt? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Rett opp feilen først\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
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"
@@@ -5064,13 -3946,10 +5059,13 @@@ msgstr "
"diskene jobbe) mens dette pågår. Da får\n"
"tallgeneratoren bedre muligheter til å samle inn vilkårlighetsdata.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nøkkelgenerering mislyktes: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5081,63 -3960,50 +5076,63 @@@ msgstr "
" «%s»\n"
"\n"
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr "Vil du fortsette? (J/n) "
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Det finnes allerede en nøkkel for «%s»\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
msgid "Create anyway? (y/N) "
msgstr "Vil du lage nøkkel likevel? (j/N) "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
msgid "creating anyway\n"
msgstr "lager likevel\n"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
"Merk: Bruk «%s %s» for å se et fullverdig dialogvindu for nøkkelgenerering.\n"
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Nøkkelgenerering ble avbrutt.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "klarte ikke å lage sikkerhetskopifila «%s»: %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "Merk: sikkerhetskopi av kortnøkkel lagret på «%s»\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, c-format
msgid "writing public key to '%s'\n"
msgstr "skriver offentlig nøkkel til «%s»\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "fant ikke skrivbart offentlig nøkkelknippe: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "feil under skriving av offentlig nøkkelknippe «%s»: %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "offentlig og hemmelig nøkkel opprettet og signert.\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
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"
@@@ -5146,7 -4012,6 +5141,7 @@@ msgstr "
"vurdere å bruke kommandoen «--edit-key» for å lage en\n"
"undernøkkel til dette formålet.\n"
- #: g10/keygen.c:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5154,7 -4019,6 +5149,7 @@@ msgstr "
"nøkkel har blitt opprettet %lu sekund i framtiden (time warp- eller "
"klokkeproblem)\n"
- #: g10/keygen.c:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5162,20 -4026,16 +5157,20 @@@ msgstr "
"nøkkel har blitt opprettet %lu sekunder i framtiden (time warp- eller "
"klokkeproblem)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
msgid "Secret parts of primary key are not available.\n"
msgstr "Hemmelige deler av primærnøkkelen er ikke tilgjengelig.\n"
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
msgid "Really create? (y/N) "
msgstr "Er du sikker på at du vil fortsette? (j/N) "
@@@ -5889,23 -4603,18 +5884,23 @@@ msgstr "Er dette bildet riktig (j/N/q)
msgid "unable to display photo ID!\n"
msgstr "klarte ikke å vise foto-ID.\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Ingen grunn oppgitt"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "Nøkkelen er overgått"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "Nøkkelen har blitt kompromittert"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "Nøkkelen er ikke lengre i bruk"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "Bruker-ID er ikke lenger gyldig"
@@@ -5982,7 -4678,6 +5977,7 @@@ msgstr "
"Laveste tillitsnivå for denne nøkkelen er: %s\n"
"\n"
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Hva velger du? "
@@@ -6125,45 -4792,36 +6120,45 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Det er ikke sikkert at signaturen tilhører brukeren.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: hoppet over: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: hoppet over. Offentlig nøkkel er ikke i bruk\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: hoppet over: offentlig nøkkel er allerede tilstede\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, c-format
msgid "can't encrypt to '%s'\n"
msgstr "klarte ikke å kryptere til «%s»\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "valgt «%s», men mangler gyldig forvalgt nøkkel\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "valgt «%s», men mangler valget «%s»\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Du skrev ikke inn en bruker-ID. (bruk evt. «-r»)\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr "Gjeldende mottakere:\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6171,37 -4829,29 +6166,37 @@@ msgstr "
"\n"
"Skriv inn bruker-ID og avslutt med tom linje: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Bruker-id-en finnes ikke.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "hoppet over: offentlig nøkkel allerede valgt som standardmottaker\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "Offentlig nøkkel er ikke i bruk.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "hoppet over: offentlig nøkkel er allerede valgt\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "«%s» er en ukjent standardmottaker\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "ingen gyldige mottakere\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Merk: nøkkel %s har ingen %s-funksjon\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Merk: nøkkel %s har ingen innstilling for %s\n"
@@@ -6300,7 -4928,6 +6295,7 @@@ msgstr "Hemmelig nøkkel er ikke tilgje
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Vil du lage et utpekt opphevelsessertifikat for denne nøkkelen? (j/N) "
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "Tvunget ASCII-armert utdata.\n"
@@@ -6318,11 -4942,9 +6313,11 @@@ msgstr "Opphevelsessertifikat opprettet
msgid "no revocation keys found for \"%s\"\n"
msgstr "fant ingen opphevelsesnøkler for «%s»\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Dette er et opphevelsessertifikat for følgende OpenPGP-nøkkel:"
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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"
@@@ -6332,7 -4954,6 +6327,7 @@@ msgstr "
"erklære offentlig at en nøkkel ikke skal brukes mer. Det er ikke mulig\n"
"å trekke tilbake en oppheving straks den er blitt publisert."
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6347,7 -4968,6 +6342,7 @@@ msgstr "
"Se beskrivelse av kommandoen «--generate-revocation» i GnuPG-\n"
"bruksanvisninga for detaljer."
- #: g10/revoke.c:577
++#: g10/revoke.c:590
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"
@@@ -6357,12 -4977,10 +6352,12 @@@ msgstr "
"Fjern dette kolonet med en tekstbehandler før du importerer og\n"
"publiserer opphevelsessertifikatet."
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, c-format
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "opphevelsessertifikat lagret som «%s.rev»\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, c-format
msgid "secret key \"%s\" not found\n"
msgstr "fant ikke hemmelig nøkkel «%s»\n"
@@@ -6370,21 -4988,17 +6365,21 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr "«%s» samsvarer med flere hemmelige nøkler:\n"
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, c-format
msgid "error searching the keyring: %s\n"
msgstr "feil under søk på nøkkelknippe: %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Vil du lage et opphevelsessertifikat for denne nøkkelen? (j/N) "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6406,33 -5020,26 +6401,33 @@@ msgstr "
"utskriftssystem kan være satt opp til å lagre utskriftsdata og dermed gjøre\n"
"det mulig for andre å lese sertifikatet.\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Velg grunn for opphevelse:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Avbryt"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Normalt bør du velge %d her)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Skriv inn en beskrivelse hvis du vil, og avslutt med tom linje:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Grunnlag for opphevelse: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(Ingen beskrivelse oppgitt)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
msgid "Is this okay? (y/N) "
msgstr "Er dette i orden? (j/N) "
@@@ -6823,10 -5356,6 +6818,10 @@@ msgstr "feil under oppretting av TOFU-t
msgid "TOFU DB error"
msgstr "TOFU DB-feil"
+#: 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
++#: g10/tofu.c:3408
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "feil under lesing av TOFU-database: %s\n"
@@@ -6856,7 -5380,6 +6851,7 @@@ msgstr "legger til kolonne «effective_
msgid "error opening TOFU database '%s': %s\n"
msgstr "feil under åpning av TOFU-database «%s»: %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "feil under oppdatering av TOFU-database: %s\n"
@@@ -7176,20 -5650,16 +7171,20 @@@ msgstr[1] "
" %s\n"
"to mark it as being bad.\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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "feil under åpning av TOFU-database: %s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
"ADVARSEL: krypterer til %s. Denne har ingen bruker-id-er som ikke er "
"opphevet\n"
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, c-format
msgid "error setting policy for key %s, user id \"%s\": %s"
msgstr "feil under endring av regel for nøkkel %s, bruker-id «%s»: %s"
@@@ -7253,7 -5711,6 +7248,7 @@@ msgstr "bruker tillitsmodell %s\n
msgid "no need for a trustdb check\n"
msgstr "kontroll av trustdb er ikke nødvendig\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "neste kontroll av trustdb planlagt %s\n"
@@@ -7281,37 -5733,31 +7276,37 @@@ msgstr "kjør «--check-trustdb»\n
msgid "checking the trustdb\n"
msgstr "kontrollerer trustdb\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "%d nøkkel behandlet"
msgstr[1] "%d nøkler behandlet"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, c-format
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
msgstr[0] "(%d gyldighetsantall klarert)\n"
msgstr[1] "(%d gyldighetsantall klarert)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "fant ingen nøkler med absolutt («ultimat») pålitelighet\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "fant ikke offentlig nøkkel for absolutt pålitelig nøkkel %s\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
"dybde: %d gyldig: %3d signert: %3d tillit: %d-, %dq, %dn, %dm, %df, %du\n"
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -7720,55 -6080,42 +7715,55 @@@ msgstr "||Skriv inn PIN-koden på leser
msgid "|N|Initial New PIN"
msgstr "|N|Ny PIN"
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr "kjør i multi-tjenermodus (forgrunn)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NIVÅ|endre feilsøkingsnivå til valgt NIVÅ"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
msgid "|FILE|write a log to FILE"
msgstr "|FIL|skriv logg til valgt FIL"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr "|N|koble til leser via port N"
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NAVN|bruk valgt NAVN som ct-API-driver"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NAME|bruk valgt NAVN som PC-/SC-driver"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
msgid "do not use the internal CCID driver"
msgstr "ikke bruk intern CCID-driver"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr "|N|koble fra kort etter N antall sekunder uten aktivitet"
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr "ikke bruk kodetastatur"
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
msgid "deny the use of admin card commands"
msgstr "avvis bruk av admin-kortkommandoer"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr "bruk inndata av vairabel lengde for kodetastatur"
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Bruk: @SCDAEMON@ [valg] (-h for hjelp)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
@@@ -7776,16 -6123,13 +7771,16 @@@ msgstr "
"Syntaks: scdaemon [valg] [kommando [arg]]\n"
"Smartcard-bakgrunnsprogram for @GNUPG@\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
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:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr "startet håndteringsprogram for fd %d\n"
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "avsluttet håndteringsprogram for fd %d\n"
@@@ -8469,7 -6660,6 +8464,7 @@@ msgstr "|FIL|legg til nøkkelknippe i l
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|BRUKER-ID|bruk valgt BRUKER-ID som forvalgt hemmelig nøkkel"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|bruk valgt nøkkeltjener til å slå opp nøkler"
@@@ -8524,17 -6704,14 +8519,17 @@@ msgstr "%s:%u: hopper over denne linja\
msgid "could not parse keyserver\n"
msgstr "klarte ikke å tolke nøkkeltjener\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "importerer sertifikat «%s»\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "klarte ikke å signere med «%s»: %s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr "ugyldig kommando (implisitt kommando finnes ikke)\n"
@@@ -9465,113 -7452,85 +9460,113 @@@ msgstr "forventet fullstendig filsti\n
msgid "looking up '%s'\n"
msgstr "slår opp «%s»\n"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr "vis innhold i CRL-hurtiglager"
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FIL|last inn CRL fra valgt FIL i hurtiglager"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr "|ADR|hent CRL fra valgt nettADResse"
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr "slå av dirmngr"
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr "tøm hurtiglager"
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr "|FIL|skriv tjenermodus-logger til valgt FIL"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
msgid "run without asking a user"
msgstr "kjør uten å spørre bruker"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr "tving innlasting av utdatert CRL"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr "tillat sending av OCSP-forespørsler"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr "tillat kontroll av programvare-versjon over nett"
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr "hindre bruk av HTTP"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr "hindre bruk av LDAP"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr "ignorer HTTP CRL-distribusjonspunkter"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr "ignorer LDAP CRL-distribusjonspunkter"
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr "ignorer OSCP-tjenesteadresser som følger sertifikater"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|ADR|videresend alle HTTP-forespørsler til valgt nettADResse"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr "|VERT|bruk valgt VERT til LDAP-oppslag"
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "ikke bruk tilbakefallsverter ved bruk av valget «--ldap-proxy»"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FIL|les LDAP-tjenerliste fra valgt FIL"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
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:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 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:216
++#: dirmngr/dirmngr.c:219
msgid "|URL|use OCSP responder at URL"
msgstr "|ADR|bruk OCSP-svartjeneste ved valgt nettADResse"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|OCSP-svartjeneste signert av FPR"
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
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:229
++#: dirmngr/dirmngr.c:232
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:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr "kjør all nettverkstrafikk gjennom Tor"
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9580,11 -7539,9 +9575,11 @@@ msgstr "
"@\n"
"Se «info»-bruksanvisning for fullstendig liste over alle kommandoer og valg\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Bruk: @DIRMNGR@ [valg] (-h for hjelp)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9592,77 -7549,60 +9587,77 @@@ msgstr "
"Syntaks: @DIRMNGR@ [valg] [kommando [arg]]\n"
"Tilgang til nøkkeltjener, CRL og OCSP for @GNUPG@\n"
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "følgende feilsøkingsnivåer er gyldige: %s\n"
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, c-format
msgid "usage: %s [options] "
msgstr "bruk: %s [valg] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
msgid "colons are not allowed in the socket name\n"
msgstr "kolon tillates ikke i sokkelnavn\n"
- #: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "henting av CRL fra «%s» mislyktes: %s\n"
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "behandling av CRL fra «%s» mislyktes: %s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: for lang linje. Hoppet over\n"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: oppdaget ugyldig fingeravtrykk\n"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: lesefeil: %s\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: ignorerer ugyldige data ved linjeslutt\n"
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
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:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr "SIGUSR2 mottatt. Ingen handling definert\n"
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr "SIGTERM mottatt. Slår av …\n"
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "SIGTERM mottatt. %d tilkoblinger er fremdeles aktive\n"
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
msgid "shutdown forced\n"
msgstr "slår av under tvang\n"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr "SIGINT mottatt. Slår av umiddelbart\n"
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "signal %d mottatt. Ingen handling definert\n"
@@@ -10087,76 -7936,60 +10082,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:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "«assuan_inquire»(%s) mislyktes: %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr "ldapserver mangler"
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr "serienummer mangler i sertifikat-ID"
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "«assuan_inquire» mislyktes: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "«fetch_cert_by_url» mislyktes: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, c-format
msgid "error sending data: %s\n"
msgstr "feil under sending av data: %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "«start_cert_fetch» mislyktes: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "«fetch_next_cert» mislyktes: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d overskredet\n"
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "klarte ikke å tildele kontrollstruktur: %s\n"
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "klarte ikke å tildele assuan-kontekst: %s\n"
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "klarte ikke å starte opp tjener: %s\n"
- #: dirmngr/server.c:2632
++#: dirmngr/server.c:2738
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "klarte ikke å registrere kommandoer i Assuan: %s\n"
- #: dirmngr/server.c:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan-godkjenningsproblem: %s\n"
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuan-behandling mislyktes: %s\n"
@@@ -10194,7 -8019,6 +10189,7 @@@ msgstr "sertifikatkjede er funnet i ord
msgid "certificate should not have been used for CRL signing\n"
msgstr "sertifikat skulle ikke vært brukt til CRL-signering\n"
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
msgid "quiet"
msgstr "stille"
@@@ -10285,258 -8089,193 +10280,258 @@@ 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr "Styring av diagnostikk-utdata"
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr "Oppsettsvalg"
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr "Nyttige feilsøkingsvalg"
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr "Sikkerhetsvalg"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|SSH-nøkler utgår etter N antall sekunder"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
"|N|endre maksimal livstid for PIN-koder i hurtiglager til N antall sekunder"
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|endre maksimal livstid for SSH-nøkler til N antall sekunder"
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr "Valg som håndhever passordfrase-regler"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr "ikke tillat avvik fra passordregler"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|endre minimal passordfrase-lengde til N"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|krev at passordfraser inneholder minst N antall spesialtegn og tall"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|FIL|kontroller nye passordfraser mot mønster i valgt FIL"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
msgid "|N|expire the passphrase after N days"
msgstr "|N|regn passord som ugyldig etter N antall dager"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
msgid "do not allow the reuse of old passphrases"
msgstr "ikke tillat gjenbruk av gamle passordfraser"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|endre tidsavbrudd for PIN-inntasting til N antall sekunder"
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NAVN|bruk valgt NAVN som forvalgt hemmelig nøkkel"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAVN|krypter også til valgt bruker-id-NAVN"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr "|SPES|sett opp e-post-alias"
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr "Oppsett for nøkkeltjenere"
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
msgid "|URL|use keyserver at URL"
msgstr "|ADR|bruk nøkkeltjener på valgt nettADResse"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr "tillat PKA-oppslag (DNS-forespørsler)"
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
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:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr "slå av all tilgang til dirmngr"
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAVN|bruk valgt kodeNAVN til PKCS#12-passordfraser"
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr "ikke se etter rotsertifikater i CRL"
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr "Valg som styrer utdata-format"
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr "Valg som styrer grensesnitt og håndheving av regler"
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
msgstr "Valg som styrer bruk av Tor"
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr "Oppsett for HTTP-tjenere"
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr "bruk systemets innstilling for HTTP-mellomtjener"
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr "Oppsett for bruk av LDAP-tjenere"
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr "LDAP-tjenerliste"
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr "Oppsett for OCSP"
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr "OpenPGP"
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr "Privatnøkler"
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr "Smartkort"
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr "S/MIME"
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
msgid "Network"
msgstr "Nettverk"
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
msgid "Passphrase Entry"
msgstr "Skriving av passordfrase"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
msgid "Component not suitable for launching"
msgstr "Komponent egner seg ikke for oppstart"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr "Ekstern bekreftelse av komponent %s mislyktes"
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr "Merk at gruppespesifikasjoner blir ignorert\n"
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, c-format
msgid "error closing '%s'\n"
msgstr "feil under lukking av «%s»\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, c-format
msgid "error parsing '%s'\n"
msgstr "feil under tolkning av «%s»\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr "vis alle komponenter"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr "kontroller alle programmer"
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr "|KOMPONENT|vis valg"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr "|KOMPONENT|endre valg"
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr "|KOMPONENT|kontroller valg"
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr "bruk globale standardverdier"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
msgstr "|FIL|oppdater oppsettsfiler ved bruk av valgt FIL"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr "hent oppsettsmapper for @GPGCONF@"
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
msgid "list global configuration file"
msgstr "vis global oppsettsfil"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
msgid "check global configuration file"
msgstr "kontroller global oppsettsfil"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
msgid "query the software version database"
msgstr "søk i versjonsdatabase"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr "last inn én eller alle komponenter på nytt"
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr "last inn valgt komponent"
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr "drep valgt komponent"
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "bruk som utdatafil"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr "ta i bruk endringer under kjøring, hvis mulig"
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Bruk: @GPGCONF@ [valg] (-h for hjelp)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10544,15 -8283,12 +10539,15 @@@ msgstr "
"Syntaks: @GPGCONF@ [valg]\n"
"Behandle oppsettsvalg for verktøy i @GNUPG at -systemet\n"
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr "Komponent-argument mangler"
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
msgid "Component not found"
msgstr "Fant ikke komponent"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
msgid "No argument allowed"
msgstr "Ingen argumenter tillatt"
diff --cc po/pl.po
index af52260,74ade4f..b3e370e
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2017-11-02 17:41+0100\n"
"Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@@ -162,26 -133,11 +162,26 @@@ msgstr "Niepoprawne hasło
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "klucze ssh większe niż %d bitów nie są obsługiwane\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -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:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -418,142 -333,103 +418,142 @@@ msgstr "
"@Opcje:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr "uruchomienie w trybie demona (w tle)"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "run in server mode"
msgid "run in supervised mode"
msgstr "uruchomienie w trybie serwera"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "z dodatkowymi informacjami"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "mniej komunikatów"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr "wyjście poleceń w stylu sh"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr "wyjście poleceń w stylu csh"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|PLIK|odczyt opcji z PLIKU"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr "nie odczepianie od konsoli"
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "użycie pliku loga dla serwera"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|użycie PGM jako programu do wprowadzania PIN-u"
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|użycie PGM jako programu SCdaemon"
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
msgid "do not use the SCdaemon"
msgstr "nie używanie SCdaemona"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, 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:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr "ignorowanie żądań zmiany TTY"
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr "ignorowanie żądań zmiany ekranu X"
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|przedawnienie pamiętanych PIN-ów po N sekundach"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr "nie używanie pamięci PIN-ów przy podpisywaniu"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, 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:231
++#: agent/gpg-agent.c:233
#, 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:234
++#: agent/gpg-agent.c:236
msgid "allow presetting passphrase"
msgstr "zezwolenie na predefiniowane hasło"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
msgid "enable ssh support"
msgstr ""
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
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:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
#, 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:515
++#: agent/gpg-agent.c:525
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -565,154 -441,113 +565,149 @@@ msgstr "
"Składnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
"Zarządzanie kluczem tajnym dla GnuPG\n"
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, 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:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "wybrany algorytm skrótów wiadomości jest niepoprawny\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 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:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, 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:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, c-format
msgid "can't create socket: %s\n"
msgstr "nie można utworzyć gniazda: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, 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:2209
++#: agent/gpg-agent.c:2232
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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
msgid "error getting nonce for the socket\n"
msgstr "błąd podczas pobierania nonce z gniazda\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, 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:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, 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:2241 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:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, 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:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, 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:2327
++#: agent/gpg-agent.c:2351
#, 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:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, 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:2686
++#: agent/gpg-agent.c:2710
#, 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:2691
++#: agent/gpg-agent.c:2715
#, 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:2766
++#: agent/gpg-agent.c:2790
#, 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:2771
++#: agent/gpg-agent.c:2795
#, 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:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, 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:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s zatrzymany\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
@@@ -729,8 -562,6 +724,8 @@@ msgstr "
"Składnia: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA\n"
"Utrzymuwanie pamięci haseł\n"
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -738,9 -569,6 +733,9 @@@ msgstr "
"@Polecenia:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -794,8 -614,6 +789,8 @@@ msgstr "anulowano\n
msgid "error while asking for the passphrase: %s\n"
msgstr "błąd podczas pytania o hasło: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -993,8 -776,6 +988,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, c-format
msgid "error forking process: %s\n"
msgstr "błąd podczas tworzenia procesu: %s\n"
@@@ -1450,7 -1133,6 +1445,7 @@@ msgstr "opcja ,,%.50s'' jest niejednozn
msgid "command \"%.50s\" is ambiguous\n"
msgstr "polecenie ,,%.50s'' jest niejednoznaczne\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
msgid "out of core\n"
msgstr "brak pamięci\n"
@@@ -1513,8 -1184,6 +1508,8 @@@ msgstr "blokada ,,%s'' nie założona:
msgid "waiting for lock %s...\n"
msgstr "oczekiwanie na blokadę %s...\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "biblioteka %s jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
@@@ -1699,8 -1331,6 +1694,8 @@@ msgstr "Karta OpenPGP niedostępna: %s\
msgid "OpenPGP card no. %s detected\n"
msgstr "Wykryto kartę OpenPGP nr %s\n"
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
msgid "can't do this in batch mode\n"
msgstr "nie działa w trybie wsadowym\n"
@@@ -1712,10 -1340,6 +1707,10 @@@ msgstr "To polecenie jest dostępne tyl
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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Twój wybór? "
@@@ -1772,17 -1383,11 +1767,17 @@@ msgstr "Błąd: pełne personalia zbyt
msgid "URL to retrieve public key: "
msgstr "URL do odczytania klucza publicznego: "
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, 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:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
@@@ -1833,7 -1427,6 +1828,7 @@@ msgstr "operacja na kluczu niewykonalna
msgid "not an OpenPGP card"
msgstr "to nie jest karta OpenPGP"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, c-format
msgid "error getting current key info: %s\n"
msgstr "błąd podczas odczytu aktualnych informacji o kluczu: %s\n"
@@@ -1873,13 -1460,10 +1868,13 @@@ msgstr "Jakiej długości klucz do uwie
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr "Karta zostanie przekonfigurowana do tworzenia klucza %u-bitowego\n"
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: 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:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 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"
@@@ -1939,9 -1513,6 +1934,9 @@@ msgstr " (2) Klucz do szyfrowania\n
msgid " (3) Authentication key\n"
msgstr " (3) Klucz do uwierzytelniania\n"
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Niewłaściwy wybór.\n"
@@@ -2075,22 -1616,14 +2070,22 @@@ msgstr "opcja --output nie działa z ty
msgid "can't open '%s'\n"
msgstr "nie można otworzyć ,,%s''\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "błąd odczytu bloku kluczy: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
#| msgid "key \"%s\" not found: %s\n"
msgid "key \"%s\" not found\n"
@@@ -2187,8 -1702,6 +2182,8 @@@ msgstr "
"OSTRZEŻENIE: wymuszone użycie szyfru %s (%d) kłóci się z ustawieniami "
"adresata\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, 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"
@@@ -2219,7 -1728,6 +2214,7 @@@ msgstr "wymuszone użycie szyfru %s (%d
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2340,26 -1824,20 +2335,26 @@@ msgstr "%s: pominięty: %s\n
msgid "writing to '%s'\n"
msgstr "zapis do ,,%s''\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "klucz %s: zawartość klucza na karcie - pominięto\n"
- #: g10/export.c:1904
++#: g10/export.c:1909
msgid "exporting secret keys not allowed\n"
msgstr "eksport kluczy tajnych nie jest dozwolony\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "OSTRZEŻENIE: nic nie zostało wyeksportowane!\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2369,14 -1846,11 +2364,14 @@@ msgstr "błąd tworzenia ,,%s'': %s\n
msgid "[User ID not found]"
msgstr "[brak identyfikatora użytkownika]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
msgstr "brak argumentu dla opcji ,,%.50s''\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2387,62 -1860,51 +2382,62 @@@
msgid "error looking up: %s\n"
msgstr "błąd zamykania %s: %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "błąd tworzenia zbioru kluczy `%s': %s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, fuzzy, c-format
#| msgid "automatically retrieved `%s' via %s\n"
msgid "automatically retrieved '%s' via %s\n"
msgstr "automatycznie pobrano `%s' poprzez %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, fuzzy, c-format
#| msgid "error retrieving `%s' via %s: %s\n"
msgid "error retrieving '%s' via %s: %s\n"
msgstr "błąd odtwarzania ,,%s'' poprzez %s: %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
msgid "No fingerprint"
msgstr "Brak odcisku"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "klucz prywatny ,,%s'' nie został odnaleziony: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NAZWA|użycie NAZWY jako domyślnego klucza tajnego"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NAZWA|użycie NAZWY jako domyślnego klucza tajnego"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, 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/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "valid values for option '%s':\n"
@@@ -2646,7 -2062,6 +2641,7 @@@ msgstr "kanoniczny format tekstowy
msgid "|FILE|write output to FILE"
msgstr "|PLIK|zapis wyjścia do PLIKU"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "pozostawienie bez zmian"
@@@ -3071,7 -2413,6 +3066,7 @@@ msgstr "%s:%d: niepoprawna lista auto-k
msgid "invalid auto-key-locate list\n"
msgstr "Niepoprawna lista auto-key-locate\n"
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "OSTRZEŻENIE: program może stworzyć plik zrzutu pamięci!\n"
@@@ -3090,7 -2428,6 +3085,7 @@@ msgstr "Nie wolno używać %s z %s!\n
msgid "%s makes no sense with %s!\n"
msgstr "%s nie ma sensu w połączeniu z %s!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr "OSTRZEŻENIE: działanie z fałszywym czasem systemowym: "
@@@ -3099,7 -2435,6 +3094,7 @@@
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:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "wybrany algorytm szyfrujący jest niepoprawny\n"
@@@ -3164,8 -2485,6 +3159,8 @@@ msgstr "niewłaściwe ustawienia algory
msgid "%s does not yet work with %s\n"
msgstr "%s jeszcze nie działa z %s!\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 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"
@@@ -3298,7 -2591,6 +3293,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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|pisanie opisu stanu do deskryptora FD"
@@@ -4671,7 -3689,6 +4666,7 @@@ msgstr "Czy dalej chcesz je dodać? (t/
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Do klucza dla PGP 2.x nie można dodać zdjęcia.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr "Taki identyfikator użytkownika już istnieje na tym kluczu!\n"
@@@ -4975,55 -3931,43 +4970,55 @@@ msgstr "zbyt wiele ustawień funkcji sk
msgid "too many compression preferences\n"
msgstr "zbyt wiele ustawień kompresji\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, fuzzy, c-format
#| msgid "invalid item `%s' in preference string\n"
msgid "invalid item '%s' in preference string\n"
msgstr "niewłaściwy element `%s' w tekście ustawień\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "zapis podpisu bezpośredniego\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "zapis podpisu klucza nim samym\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "zapis podpisu wiążącego klucz\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "niewłaściwa długość klucza; wykorzystano %u bitów\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "rozmiar klucza zaokrąglony w górę do %u bitów\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"OSTRZEŻENIE: niektóre programy OpenPGP nie potrafią obsłużyć klucza RSA o "
"tej długości skrótu\n"
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
msgid "Sign"
msgstr "Podpisywanie"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr "Certyfikowanie"
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
msgid "Encrypt"
msgstr "Szyfrowanie"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr "Uwierzytelnianie"
@@@ -5037,158 -3981,127 +5032,158 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr "PpSsUuZz"
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Możliwe akcje dla klucza %s: "
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr "Aktualnie dopuszczalne akcje: "
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Przełączenie możliwości podpisywania\n"
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Przełączenie możliwości szyfrowania\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Przełączenie możliwości uwierzytelniania\n"
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Zakończenie\n"
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Proszę wybrać rodzaj klucza:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA i RSA (domyślne)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA i Elgamala\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (tylko do podpisywania)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (tylko do podpisywania)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamala (tylko do szyfrowania)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (tylko do szyfrowania)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (możliwości do ustawienia)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (możliwości do ustawienia)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, fuzzy, c-format
#| msgid " (%d) DSA and Elgamal\n"
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA i Elgamala\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (tylko do podpisywania)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, fuzzy, c-format
#| msgid " (%d) DSA (set your own capabilities)\n"
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) DSA (możliwości do ustawienia)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (tylko do szyfrowania)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, fuzzy, c-format
#| msgid " (%d) Existing key\n"
msgid " (%d) Existing key\n"
msgstr " (%d) Istniejący klucz\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
msgid "Enter the keygrip: "
msgstr "Uchwyt klucza: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "Nieprawidłowy uchwyt klucza (oczekiwano 40 cyfr szesnastkowych)\n"
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
msgid "No key with this keygrip\n"
msgstr "Brak klucza o tym uchwycie\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "zaokrąglono do %u bitów\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "Klucze %s będą miały od %u do %u bitów długości.\n"
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Jakiej długości podklucz wygenerować? (%u) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Jakiej długości klucz wygenerować? (%u) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Żądana długość klucza to %u bitów.\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Proszę wybrać rodzaj klucza:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5204,7 -4117,6 +5199,7 @@@ msgstr "
" <n>m = termin ważności klucza upływa za n miesięcy\n"
" <n>y = termin ważności klucza upływa za n lat\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5220,38 -4132,30 +5215,38 @@@ msgstr "
" <n>m = termin ważności podpisu upływa za n miesięcy\n"
" <n>y = termin ważności podpisu upływa za n lat\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "Okres ważności klucza? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Okres ważności podpisu? (%s) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "niepoprawna wartość\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
msgid "Key does not expire at all\n"
msgstr "Klucz nie wygaśnie w ogóle\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
msgid "Signature does not expire at all\n"
msgstr "Podpis nie wygaśnie w ogóle\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, c-format
msgid "Key expires at %s\n"
msgstr "Klucz traci ważność %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, c-format
msgid "Signature expires at %s\n"
msgstr "Ważność podpisu wygasa %s\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5259,11 -4163,9 +5254,11 @@@ msgstr "
"Twój system nie potrafi pokazać daty po roku 2038.\n"
"Niemniej daty do roku 2106 będą poprawnie obsługiwane.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
msgid "Is this correct? (y/N) "
msgstr "Czy wszystko się zgadza (t/N)? "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5277,7 -4179,6 +5272,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5293,50 -4194,39 +5288,50 @@@ msgstr "
" \"Tadeusz Żeleński (Boy) <tzb at ziemianska.pl>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Imię i nazwisko: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Niewłaściwy znak w imieniu lub nazwisku\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "Imię lub nazwisko nie może zaczynać się od cyfry\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "Imię i nazwisko muszą mieć co najmniej 5 znaków długości.\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "Adres poczty elektronicznej: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "To nie jest poprawny adres poczty elektronicznej\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Komentarz: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Niewłaściwy znak w komentarzu\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Używasz zestawu znaków %s.\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5347,7 -4237,6 +5342,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Nie należy umieszczać adresu poczty elektronicznej w polu nazwiska czy\n"
@@@ -5364,35 -4253,28 +5359,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "IiKkEeDdWw"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Zmienić (I)mię/nazwisko, (K)omentarz, adres (E)mail, czy (W)yjść? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Zmienić (I)mię/nazwisko, (K)omentarz, adres (E)mail, przejść (D)alej,\n"
"czy (W)yjść z programu? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Zmienić (I)mię/nazwisko, adres (E)mail, czy (W)yjść? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr ""
"Zmienić (I)mię/nazwisko, adres (E)mail, przejść (D)alej,\n"
"czy (W)yjść z programu? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Najpierw trzeba poprawić ten błąd\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5408,13 -4290,10 +5403,13 @@@ msgstr "
"ilości\n"
"entropii.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generacja klucza nie powiodła się: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5422,71 -4301,58 +5417,71 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "klucz już istnieje\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
#, fuzzy
#| msgid "Use this key anyway? (y/N) "
msgid "Create anyway? (y/N) "
msgstr "Użyć tego klucza pomimo to? (t/N) "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "generowanie nowego klucza\n"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Procedura generacji klucza została anulowana.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, fuzzy, c-format
#| msgid "can't create backup file `%s': %s\n"
msgid "can't create backup file '%s': %s\n"
msgstr "nie można utworzyć pliku kopii zapasowej ,,%s'': %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "UWAGA: kopia zapasowa klucza karty zapisana do ,,%s''\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "zapisuję klucz publiczny w ,,%s''\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "błąd podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "klucz publiczny i prywatny (tajny) zostały utworzone i podpisane.\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
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"
@@@ -5494,7 -4360,6 +5489,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:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5502,7 -4367,6 +5497,7 @@@ msgstr "
"klucz został stworzony %lu sekundę w przyszłości (zaburzenia\n"
"czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
- #: g10/keygen.c:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5510,22 -4374,18 +5505,22 @@@ msgstr "
"klucz został stworzony %lu sekund w przyszłości (zaburzenia\n"
"czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
#, 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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
msgid "Secret parts of primary key are not available.\n"
msgstr "Część tajna głównego klucza jest niedostępna.\n"
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
msgid "Really create? (y/N) "
msgstr "Czy na pewno utworzyć? (t/N) "
@@@ -6293,23 -5007,18 +6288,23 @@@ msgstr "Czy zdjęcie jest w porządku?
msgid "unable to display photo ID!\n"
msgstr "nie można wyświetlić zdjęcia!\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "nie podano przyczyny"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "klucz został zastąpiony"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "klucz został skompromitowany"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "klucz nie jest już używany"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "identyfikator użytkownika przestał być poprawny"
@@@ -6385,7 -5081,6 +6380,7 @@@ msgstr "
"Minimalny poziom zaufania dla tego klucza to: %s\n"
"\n"
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Twoja decyzja? "
@@@ -6536,48 -5203,39 +6531,48 @@@ msgstr "
" Nie ma pewności co do tożsamości osoby która złożyła ten "
"podpis.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: pominięty: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: pominięty: klucz publiczny wyłączony z użytku\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: pominięty: został już wybrany w innej opcji\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "nie można się połączyć z ,,%s'': %s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but no valid default keys given\n"
msgstr "linia %d: niewłaściwy algorytm\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but option '%s' not given\n"
msgstr "linia %d: niewłaściwy algorytm\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Nie został podany identyfikator użytkownika (np. za pomocą ,,-r'')\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr "Aktualni odbiorcy:\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6585,37 -5243,29 +6580,37 @@@ msgstr "
"\n"
"Identyfikator użytkownika (pusta linia oznacza koniec): "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Brak takiego identyfikatora użytkownika.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "pominięty: klucz publiczny już jest domyślnym adresatem\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "Klucz publiczny wyłączony z użycia.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "pominięty: został już wybrany w innej opcji\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "nieznany domyślny adresat ,,%s''\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "brak poprawnych adresatów\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Uwaga: klucz %s nie ma cechy %s\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Uwaga: klucz %s nie ma preferencji dla %s\n"
@@@ -6722,7 -5350,6 +6717,7 @@@ msgstr "Dostępny jest klucz tajny.\n
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Stworzyć certyfikat unieważnienia tego klucza? (t/N) "
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "wymuszono opakowanie ASCII wyniku.\n"
@@@ -6740,20 -5364,17 +6735,20 @@@ msgstr "Certyfikat unieważnienia zosta
msgid "no revocation keys found for \"%s\"\n"
msgstr "brak kluczy unieważniających dla ,,%s''\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Stworzyć certyfikat unieważnienia tego klucza? (t/N) "
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6762,20 -5383,17 +6757,20 @@@
"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:577
++#: g10/revoke.c:590
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Certyfikat unieważnienia został utworzony.\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6784,22 -5402,18 +6779,22 @@@ msgstr "klucz prywatny ,,%s'' nie zosta
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "błąd tworzenia zbioru kluczy `%s': %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Stworzyć certyfikat unieważnienia tego klucza? (t/N) "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6823,33 -5437,26 +6818,33 @@@ msgstr "
"komputerów mogą zachować treść wydruku i udostępnić ją osobom "
"nieupoważnionym.\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Proszę wybrać powód unieważnienia:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Anuluj"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Prawdopodobnie chcesz tu wybrać %d)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Wprowadź opis (nieobowiązkowy) i zakończ go pustą linią:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Powód unieważnienia: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(nie podano)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
msgid "Is this okay? (y/N) "
msgstr "Informacje poprawne? (t/N) "
@@@ -7279,10 -5812,6 +7274,10 @@@ msgstr "błąd tworzenia pliku tymczaso
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
@@@ -7317,7 -5841,6 +7312,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "błąd podczas otwierania ,,%s'': %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
@@@ -7663,19 -6137,15 +7658,19 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, 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:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7740,7 -6198,6 +7735,7 @@@ msgstr "użycie modelu zaufania %s\n
msgid "no need for a trustdb check\n"
msgstr "sprawdzanie bazy jest niepotrzebne\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "następne sprawdzanie bazy odbędzie się %s\n"
@@@ -7770,7 -6222,6 +7765,7 @@@ msgstr "należy uruchomić gpg z opcj�
msgid "checking the trustdb\n"
msgstr "sprawdzanie bazy zaufania\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
#| msgid "%lu keys processed so far\n"
msgid "%d key processed"
@@@ -7779,7 -6230,6 +7774,7 @@@ msgstr[0] "%lu kluczy przetworzonych d
msgstr[1] "%lu kluczy przetworzonych do tej chwili\n"
msgstr[2] "%lu kluczy przetworzonych do tej chwili\n"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7788,16 -6238,13 +7783,16 @@@ msgstr[0] "przetworzono %d kluczy (rozw
msgstr[1] "przetworzono %d kluczy (rozwiązano %d przeliczeń zaufania)\n"
msgstr[2] "przetworzono %d kluczy (rozwiązano %d przeliczeń zaufania)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "brak absolutnie zaufanych kluczy\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "klucz publiczny absolutnie zaufanego klucza %s nie odnaleziony\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7805,7 -6252,6 +7800,7 @@@ msgstr "
"poziom: %d poprawnych: %3d podpisanych: %3d zaufanie: %d-,%dq,%dn,%dm,%df,"
"%du\n"
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -8241,57 -6601,44 +8236,57 @@@ msgstr "||Proszę wprowadzić PIN na kl
msgid "|N|Initial New PIN"
msgstr "|N|Początkowy nowy PIN"
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|POZIOM|ustawienie POZIOMU diagnostyki"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
msgid "|FILE|write a log to FILE"
msgstr "|PLIK|zapisanie logów do PLIKu"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr "|N|połączenie z czytnikiem na porcie N"
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NAZWA|użycie NAZWY jako sterownika ct-API"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NAZWA|użycie NAZWY jako sterownika PC/SC"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
msgid "do not use the internal CCID driver"
msgstr "nie używanie wewnętrznego sterownika CCID"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr "|N|odłączenie karty po N sekundach nieaktywności"
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr "nie używanie klawiatury czytnika"
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
msgid "deny the use of admin card commands"
msgstr "zabronienie używania poleceń karty administratora"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr "użycie wejścia z klawiatury czytnika o zmiennej długości"
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Wywołanie: gpgconf [opcje] (-h podaje pomoc)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
#, fuzzy
#| msgid ""
#| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8303,19 -6650,16 +8298,19 @@@ msgstr "
"Składnia: scdaemon [opcje] [polecenie [argumenty]]\n"
"Demon kart procesorowych dla GnuPG\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
#, fuzzy
#| msgid ""
#| "please use the option `--daemon' to run the program in the background\n"
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr "proszę użyć opcji ,,--daemon'' do uruchomienia programu w tle\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr "obsługa fd %d uruchomiona\n"
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "obsługa fd %d zakończona\n"
@@@ -9026,7 -7217,6 +9021,7 @@@ msgstr "|PLIK|dodanie tego zbioru klucz
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|UŻYTKOWNIK|użycie tego identyfikatora jako domyślnego klucza tajnego"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|użycie tego serwera do wyszukiwania kluczy"
@@@ -9091,19 -7271,16 +9086,19 @@@ msgstr "%s:%u: linia pominięta\n
msgid "could not parse keyserver\n"
msgstr "niezrozumiały adres serwera kluczy\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, 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:1725
++#: sm/gpgsm.c:1726
#, 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:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr "błędne polecenie (nie ma polecenia domyślnego)\n"
@@@ -10144,127 -8131,99 +10139,127 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
#, 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:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "przekazanie polecenia do dirmngr"
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr "|PLIK|zapisanie logów trybu serwerowego do PLIKu"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "Wyjść bez zapisania zmian? (t/N) "
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "zezwolenie na wyszukiwania PKA (żądania DNS)"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
#, fuzzy
#| msgid "|FILE|read options from FILE"
msgid "|FILE|read LDAP server list from FILE"
msgstr "|PLIK|odczyt opcji z PLIKU"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 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:216
++#: dirmngr/dirmngr.c:219
#, fuzzy
#| msgid "|URL|use keyserver at URL"
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|używaj serwera kluczy URL"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10277,13 -8236,11 +10272,13 @@@ msgstr "
"@\n"
"(Pełną listę poleceń i opcji można znaleźć w podręczniku systemowym.)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
#, 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:394
++#: dirmngr/dirmngr.c:402
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10295,88 -8252,71 +10290,88 @@@ msgstr "
"Składnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
"Zarządzanie kluczem tajnym dla GnuPG\n"
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, 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:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "wywołanie: gpgsm [opcje]"
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
#, 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:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, 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:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, 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:1626
++#: dirmngr/dirmngr.c:1639
#, 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:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "niewłaściwy odcisk"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, 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:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "nie wymuszono"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10861,86 -8710,70 +10856,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, 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:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, 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:1333
++#: dirmngr/server.c:1427
#, 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:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, 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:1483
++#: dirmngr/server.c:1577
#, 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:1516
++#: dirmngr/server.c:1610
#, 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:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, 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:2603
++#: dirmngr/server.c:2709
#, 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:2624
++#: dirmngr/server.c:2730
#, 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:2632
++#: dirmngr/server.c:2738
#, 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:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10992,7 -8817,6 +10987,7 @@@ msgstr "certyfikat jest dobry\n
msgid "certificate should not have been used for CRL signing\n"
msgstr "certyfikat nie powinien być używany do podpisywania\n"
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
msgid "quiet"
msgstr "cicho"
@@@ -11094,285 -8898,220 +11089,285 @@@ 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr "Opcje sterujące wyjściem diagnostycznym"
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr "Opcje sterujące konfiguracją"
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr "Opcje przydatne do diagnostyki"
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr "Opcje sterujące bezpieczeństwem"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|przedawnienie kluczy SSH po N sekundach"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
"|N|ustawienie maksymalnego czasu życia pamięci podręcznej PIN-ów na N sekund"
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|ustawienie maksymalnego czasu życia kluczy SSH na N sekund"
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr "Opcje wymuszające politykę haseł"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr "nie zezwalanie na pominięcie polityki haseł"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|ustawienie minimalnej długości nowych haseł na N"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|wymaganie przynajmniej N znaków niealfanumerycznych w nowym haśle"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|PLIK|sprawdzanie nowych haseł pod kątem wzorców z PLIKU"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
msgid "|N|expire the passphrase after N days"
msgstr "|N|przedawnianie haseł po N dniach"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
msgid "do not allow the reuse of old passphrases"
msgstr "nie zezwalanie na ponowne użycie starych haseł"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
#, fuzzy
#| msgid "|N|set maximum PIN cache lifetime to N seconds"
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
"|N|ustawienie maksymalnego czasu życia pamięci podręcznej PIN-ów na N sekund"
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NAZWA|użycie NAZWY jako domyślnego klucza tajnego"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAZWA|szyfrowanie także dla odbiorcy NAZWA"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|określ adres email"
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr "Konfiguracja dla serwerów kluczy"
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
msgid "|URL|use keyserver at URL"
msgstr "|URL|używaj serwera kluczy URL"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr "zezwolenie na wyszukiwania PKA (żądania DNS)"
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
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:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr "zablokuj dostęp do dirmngr"
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAZWA|użycie kodowania NAZWA dla haseł PKCS#12"
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr "nie sprawdzanie CRL dla głównych certyfikatów"
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr "Opcje sterujące formatem wyjścia"
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr "Opcje sterujące interaktywnością i wymuszaniem"
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
#, fuzzy
#| msgid "Options controlling the security"
msgid "Options controlling the use of Tor"
msgstr "Opcje sterujące bezpieczeństwem"
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr "Konfiguracja dla serwerów HTTP"
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr "użycie systemowego ustawienia proxy HTTP"
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr "Konfiguracja używanych serwerów LDAP"
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr "lista serwerów LDAP"
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr "Konfiguracja dla OCSP"
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
msgid "Network"
msgstr ""
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
#| msgid "Bad Passphrase"
msgid "Passphrase Entry"
msgstr "Niepoprawne hasło"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
#, fuzzy
#| msgid "Component not found"
msgid "Component not suitable for launching"
msgstr "Nie znaleziono komponentu"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr "Zewnętrzna weryfikacja komponentu %s nie powiodła się"
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr "Uwaga, określenia grup są ignorowane\n"
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, 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:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error parsing '%s'\n"
msgstr "błąd w ,,%s'': %s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr "lista wszystkich komponentów"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr "sprawdzenie wszystkich programów"
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr "|KOMPONENT|wypisanie opcji"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr "|KOMPONENT|zmiana opcji"
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr "|KOMPONENT|zaznaczenie opcji"
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr "zastosowanie globalnych wartości domyślnych"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
#, fuzzy
#| msgid "|FILE|take policy information from FILE"
msgid "|FILE|update configuration files using FILE"
msgstr "|PLIK|pobranie informacji o polityce z PLIKU"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
#, fuzzy
#| msgid "get the configuration directories for gpgconf"
msgid "get the configuration directories for @GPGCONF@"
msgstr "katalogi konfiguracyjne programu gpgconf"
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
msgid "list global configuration file"
msgstr "wyświetl globalny plik konfiguracyjny"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
msgid "check global configuration file"
msgstr "sprawdzenie globalnego pliku konfiguracyjnego"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "uaktualnienie bazy zaufania"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
#, fuzzy
#| msgid "list all components"
msgid "reload all or a given component"
msgstr "lista wszystkich komponentów"
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
#, fuzzy
#| msgid "list all components"
msgid "launch a given component"
msgstr "lista wszystkich komponentów"
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
#, fuzzy
#| msgid "list all components"
msgid "kill a given component"
msgstr "lista wszystkich komponentów"
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "plik wyjściowy"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr "uaktywnienie zmian w czasie działania o ile to możliwe"
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
#, 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:131
++#: tools/gpgconf.c:139
#, fuzzy
#| msgid ""
#| "Syntax: gpgconf [options]\n"
@@@ -11384,15 -9123,12 +11379,15 @@@ msgstr "
"Składnia: gpgconf [opcje]\n"
"Zarządzanie opcjami konfiguracji dla narzędzi z systemu GnuPG\n"
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr "Wymagany jest jeden argument komponentu"
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
msgid "Component not found"
msgstr "Nie znaleziono komponentu"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
msgid "No argument allowed"
msgstr "Argument nie jest dozwolony"
diff --cc po/pt.po
index 9b6df18,dab31d8..81111b7
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2015-02-11 19:17+0100\n"
"Last-Translator: Pedro Morais <morais at kde.org>\n"
"Language-Team: pt <morais at kde.org>\n"
@@@ -158,26 -129,11 +158,26 @@@ msgstr "frase secreta incorrecta
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritmo de protecção %d%s não é suportado\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -382,8 -299,6 +382,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "muda a frase secreta"
- #: agent/gpg-agent.c:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -393,70 -308,50 +393,70 @@@ msgstr "
"Opções:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "A chave foi substituída"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "detalhado"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "ser mais silencioso"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "procurar chaves num servidor de chaves"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualizar a base de dados de confiança"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, fuzzy
#| msgid "|NAME|set terminal charset to NAME"
msgid "|NAME|accept some commands via NAME"
@@@ -464,55 -359,43 +464,55 @@@ msgstr "
"|NOME|definir mapa de caracteres do terminal como\n"
"NOME"
- #: agent/gpg-agent.c:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "erro na criação da frase secreta: %s\n"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
#, fuzzy
msgid "allow presetting passphrase"
msgstr "erro na criação da frase secreta: %s\n"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "não suportado"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -521,166 -404,118 +521,161 @@@ msgstr "não suportado
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado é inválido\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 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:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, 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:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "impossível criar %s: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
#, 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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "erro na criação da frase secreta: %s\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, 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:2241 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:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "a escrever chave privada para `%s'\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, 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:2327
++#: agent/gpg-agent.c:2351
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: impossível criar directoria: %s\n"
- #: agent/gpg-agent.c:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2771
++#: agent/gpg-agent.c:2795
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "actualização da chave secreta falhou: %s\n"
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ignorado: %s\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
@@@ -696,8 -529,6 +691,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -705,9 -536,6 +700,9 @@@ msgstr "
"@Comandos:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -761,8 -581,6 +756,8 @@@ msgstr "cancelado pelo utilizador\n
msgid "error while asking for the passphrase: %s\n"
msgstr "erro na criação da frase secreta: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@@ -946,8 -729,6 +941,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@@ -1424,7 -1107,6 +1419,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
#, fuzzy
msgid "out of core\n"
msgstr "não processado"
@@@ -1483,8 -1154,6 +1478,8 @@@ msgstr "chave pública %08lX não encon
msgid "waiting for lock %s...\n"
msgstr "a escrever chave privada para `%s'\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1669,8 -1301,6 +1664,8 @@@ msgstr "chave secreta não disponível
msgid "OpenPGP card no. %s detected\n"
msgstr ""
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "impossível fazer isso em modo não-interativo\n"
@@@ -1685,10 -1313,6 +1680,10 @@@ msgstr "Este comando não é permitido
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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Opção? "
@@@ -1750,17 -1361,11 +1745,17 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "a escrever chave pública para `%s'\n"
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, 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:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "erro na escrita do porta-chaves `%s': %s\n"
@@@ -1817,7 -1411,6 +1812,7 @@@ msgstr "A geração de chaves falhou: %
msgid "not an OpenPGP card"
msgstr "nenhum dado OpenPGP válido encontrado.\n"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
@@@ -1853,13 -1440,10 +1848,13 @@@ msgstr "Qual o tamanho de chave desejad
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr ""
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1914,9 -1488,6 +1909,9 @@@ msgstr " (%d) RSA (apenas cifragem)\n
msgid " (3) Authentication key\n"
msgstr ""
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Opção inválida.\n"
@@@ -2057,22 -1598,14 +2052,22 @@@ msgstr "--output não funciona para est
msgid "can't open '%s'\n"
msgstr "impossível abrir `%s'\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "erro na leitura do bloco de chave: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "chave `%s' não encontrada: %s\n"
@@@ -2168,8 -1683,6 +2163,8 @@@ msgid "
msgstr ""
"ao forçar a cifra simétrica %s (%d) viola as preferências do destinatário\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, 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"
@@@ -2199,7 -1708,6 +2194,7 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%s\"\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2319,27 -1803,21 +2314,27 @@@ msgstr "%s: ignorado: %s\n
msgid "writing to '%s'\n"
msgstr "a escrever para `%s'\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, 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:1904
++#: g10/export.c:1909
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "a escrever chave privada para `%s'\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "AVISO: nada exportado\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/plaintext.c:167 g10/plaintext.c:190
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
@@@ -2350,13 -1827,10 +2345,13 @@@ msgstr "erro ao criar `%s': %s\n
msgid "[User ID not found]"
msgstr "[Utilizador não encontrado]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opções de importação inválidas\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2366,60 -1839,49 +2361,60 @@@
msgid "error looking up: %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "erro ao criar porta-chaves `%s': %s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "erro ao criar `%s': %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "erro ao criar `%s': %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
#, fuzzy
msgid "No fingerprint"
msgstr "mostra impressão digital"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "chave `%s' não encontrada: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NOME|usar NOME como chave secreta por omissão"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NOME|usar NOME como chave secreta por omissão"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, 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/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "opções de importação inválidas\n"
@@@ -2633,7 -2049,6 +2628,7 @@@ msgstr "usar modo de texto canônico
msgid "|FILE|write output to FILE"
msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "não fazer alterações"
@@@ -3023,7 -2365,6 +3018,7 @@@ msgstr "%s:%d: opções de exportaçã
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um ficheiro core!\n"
@@@ -3042,7 -2380,6 +3037,7 @@@ msgstr "%s não é permitido com %s!\n
msgid "%s makes no sense with %s!\n"
msgstr "%s não faz sentido com %s!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr ""
@@@ -3051,7 -2387,6 +3046,7 @@@
msgid "will not run with insecure memory due to %s\n"
msgstr "a escrever chave privada para `%s'\n"
- #: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado é inválido\n"
@@@ -3118,8 -2439,6 +3113,8 @@@ msgstr "preferências pessoais de compr
msgid "%s does not yet work with %s\n"
msgstr "%s não faz sentido com %s!\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
@@@ -3249,7 -2542,6 +3244,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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr ""
"|DF|escrever informações de estado para o\n"
@@@ -4631,7 -3649,6 +4626,7 @@@ msgid "You may not add a photo ID to a
msgstr ""
"Não pode adicionar um identificador fotográfico a uma chave tipo PGP2.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr ""
@@@ -4936,54 -3892,42 +4931,54 @@@ msgstr "demasiadas preferências `%c'\n
msgid "too many compression preferences\n"
msgstr "demasiadas preferências `%c'\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "caracter inválido na cadeia de caractéres da preferência\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "a escrever a assinatura directa\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "a escrever a auto-assinatura\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "a escrever a assinatura ligada a uma chave\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tamanho de chave inválido; a utilizar %u bits\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tamanho da chave arredondado para %u bits\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
#, fuzzy
msgid "Sign"
msgstr "sign"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
#, fuzzy
msgid "Encrypt"
msgstr "cifrar dados"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr ""
@@@ -4997,157 -3941,126 +4992,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (apenas cifragem)\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Por favor selecione o tipo de chave desejado:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA e ElGamal (por omissão)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA e ElGamal (por omissão)\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (apenas assinatura)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (apenas assinatura)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (apenas cifragem)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (apenas cifragem)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (apenas cifragem)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (apenas cifragem)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA e ElGamal (por omissão)\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (apenas assinatura)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (apenas cifragem)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (apenas cifragem)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (apenas cifragem)\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Notação de assinatura: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Nenhum ID de utilizador com índice %d\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "arredondado para %u bits\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Qual o tamanho de chave desejado? (1024) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Qual o tamanho de chave desejado? (1024) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "O tamanho de chave pedido é %u bits\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Por favor selecione o tipo de chave desejado:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5163,7 -4076,6 +5158,7 @@@ msgstr "
" <n>m = chave expira em n meses\n"
" <n>y = chave expira em n anos\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5179,40 -4091,32 +5174,40 @@@ msgstr "
" <n>m = assinatura expira em n meses\n"
" <n>y = assinatura expira em n anos\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "A chave é valida por? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "A assinatura é valida por? (0) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "valor inválido\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "A %s não expira nunca\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "A %s não expira nunca\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s expira em %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5220,12 -4124,10 +5215,12 @@@ msgstr "
"O seu sistema não consegue mostrar datas para além de 2038.\n"
"No entanto, estas vão ser tratadas correctamente até 2106.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Está correto (s/n)? "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5236,7 -4138,6 +5231,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
#, fuzzy
msgid ""
"\n"
@@@ -5254,50 -4155,39 +5249,50 @@@ msgstr "
" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Nome completo: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Caracter inválido no nome\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "O nome não pode começar com um dígito\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "O nome deve ter pelo menos 5 caracteres\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "Endereço de correio eletrónico: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "Endereço eletrónico inválido\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Comentário: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Caracter inválido no comentário\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Você está usando o conjunto de caracteres `%s'.\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5308,7 -4198,6 +5303,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Por favor não coloque o endereço de email no nome verdadeiro ou no "
@@@ -5325,35 -4214,28 +5320,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoSs"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Mudar (N)ome, (C)omentário, (E)mail ou (S)air? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Mudar (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Mudar (N)ome, (C)omentário, (E)mail ou (S)air? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Mudar (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Por favor corrija primeiro o erro\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
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"
@@@ -5365,13 -4247,10 +5360,13 @@@ msgstr "
"geração dos números primos; isso dá ao gerador de números aleatórios\n"
"uma hipótese maior de ganhar entropia suficiente.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A geração de chaves falhou: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5379,68 -4258,55 +5374,68 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "%s' já comprimido\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "Criar mesmo assim?"
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "Criar mesmo assim?"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Geração de chave cancelada.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "impossível criar `%s': %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "NOTA: chave secreta %08lX expirou em %s\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "a escrever chave pública para `%s'\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenhum porta-chaves público com permissões de escrita encontrado: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "erro ao escrever no porta-chaves público `%s': %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "chaves pública e privada criadas e assinadas.\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5449,7 -4315,6 +5444,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:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5457,7 -4322,6 +5452,7 @@@ msgstr "
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no relógio)\n"
- #: g10/keygen.c:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5465,22 -4329,18 +5460,22 @@@ msgstr "
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no relógio)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
#, 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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
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:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
#, 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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Realmente criar? "
@@@ -6224,23 -4938,18 +6219,23 @@@ msgstr "Está correto (s/n)?
msgid "unable to display photo ID!\n"
msgstr "não foi possível alterar o exec-path para %s\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Nenhum motivo especificado"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "A chave foi substituída"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "A chave foi comprometida"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "A chave já não é utilizada"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "O identificador do utilizador já não é válido"
@@@ -6321,7 -5017,6 +6316,7 @@@ msgid "
"\n"
msgstr ""
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Decisão? "
@@@ -6472,46 -5139,37 +6467,46 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Não se tem certeza de que a assinatura pertence ao dono.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ignorado: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: ignorado: a chave pública está desactivada\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ignorado: a chave pública já está presente\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "impossível ligar a `%s': %s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "algoritmo de dispersão inválido `%s'\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "algoritmo de dispersão inválido `%s'\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Não especificou um identificador de utilizador. (pode usar \"-r\")\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6519,37 -5177,29 +6514,37 @@@ msgstr "
"\n"
"Insira o identificador do utilizador. Termine com uma linha vazia: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Identificador de utilizador inexistente.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "ignorado: chave pública já colocada como destinatário por omissão\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "A chave pública está desativada.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "ignorado: a chave pública já está presente\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatário por omissão desconhecido `%s'\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "nenhum endereço válido\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "chave %08lX: sem ID de utilizador\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "chave %08lX: sem ID de utilizador\n"
@@@ -6654,7 -5282,6 +6649,7 @@@ msgstr "Chave secreta disponível.\n
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr ""
@@@ -6673,19 -5297,16 +6668,19 @@@ msgstr "chave %08lX: certificado de rev
msgid "no revocation keys found for \"%s\"\n"
msgstr ""
- #: g10/revoke.c:552
++#: g10/revoke.c:565
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6694,19 -5315,16 +6689,19 @@@
"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:577
++#: g10/revoke.c:590
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "chave `%s' não encontrada: %s\n"
@@@ -6714,23 -5332,19 +6709,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "erro ao criar porta-chaves `%s': %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6741,37 -5355,30 +6736,37 @@@
"your machine might store the data and make it available to others!\n"
msgstr ""
- #: g10/revoke.c:775
++#: g10/revoke.c:788
#, fuzzy
msgid "Please select the reason for the revocation:\n"
msgstr "motivo da revocação: "
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr ""
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr ""
- #: g10/revoke.c:828
++#: g10/revoke.c:841
#, fuzzy
msgid "Enter an optional description; end it with an empty line:\n"
msgstr ""
"\n"
"Insira o identificador do utilizador. Termine com uma linha vazia: "
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, fuzzy, c-format
msgid "Reason for revocation: %s\n"
msgstr "motivo da revocação: "
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr ""
- #: g10/revoke.c:863
++#: g10/revoke.c:876
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Usar esta chave de qualquer modo? "
@@@ -7178,10 -5711,6 +7173,10 @@@ msgstr "erro na criação da frase secr
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
@@@ -7213,7 -5737,6 +7208,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
@@@ -7523,18 -5997,14 +7518,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7600,7 -6058,6 +7595,7 @@@ msgstr "
msgid "no need for a trustdb check\n"
msgstr "não é necessária uma verificação da base de dados de confiança\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "proxima verificação da base de dados de confiança a %s\n"
@@@ -7628,39 -6080,33 +7623,39 @@@ msgstr "
msgid "checking the trustdb\n"
msgstr "a verificar a base de dados de confiança\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "%lu chaves processadas até agora\n"
msgstr[1] "%lu chaves processadas até agora\n"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, c-format
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
#, fuzzy
msgid "no ultimately trusted keys found\n"
msgstr ""
"chave pública da chave absolutamente de confiança %08lX não encontrada\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr ""
"chave pública da chave absolutamente de confiança %08lX não encontrada\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "registo de confiança %lu, tipo %d: escrita falhou: %s\n"
@@@ -8089,76 -6449,60 +8084,76 @@@ msgstr "muda a frase secreta
msgid "|N|Initial New PIN"
msgstr ""
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr ""
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
#, fuzzy
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NOME|usar NOME como destinatário por omissão"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
#, fuzzy
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NOME|usar NOME como destinatário por omissão"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
#, fuzzy
msgid "do not use the internal CCID driver"
msgstr "nunca usar o terminal"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr ""
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr ""
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
#, fuzzy
msgid "deny the use of admin card commands"
msgstr "comandos em conflito\n"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8880,7 -7071,6 +8875,7 @@@ msgstr "
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOME|usar NOME como chave secreta por omissão"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
@@@ -8940,17 -7120,14 +8935,17 @@@ msgstr " s = saltar esta chave\n
msgid "could not parse keyserver\n"
msgstr "não consegui processar a URI do servidor de chaves\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "a escrever para `%s'\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "impossível fechar `%s': %s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9899,116 -7886,88 +9894,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
#, fuzzy
msgid "run without asking a user"
msgstr "Sair sem gravar? "
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "não consegui processar a URI do servidor de chaves\n"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10021,91 -7980,72 +10016,91 @@@ msgstr "
"@\n"
"(Veja a página man para uma lista completa de comandos e opções)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uso: gpg [opções] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
#, 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:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "criação de armadura falhou: %s\n"
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "criação de armadura falhou: %s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "frase secreta demasiado longa\n"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s: versão de ficheiro inválida %d\n"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "armadura: %s\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
#, fuzzy
msgid "shutdown forced\n"
msgstr "não processado"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10550,77 -8399,61 +10545,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assinatura falhou: %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assinatura falhou: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "remoção do bloco de chave falhou: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "remoção do bloco de chave falhou: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "remoção do bloco de chave falhou: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "impossível criar `%s': %s\n"
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, 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:2624
++#: dirmngr/server.c:2730
#, 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:2632
++#: dirmngr/server.c:2738
#, 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:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10664,7 -8489,6 +10659,7 @@@ msgstr "preferência %c%lu duplicada\n
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
#, fuzzy
msgid "quiet"
msgstr "sair"
@@@ -10757,288 -8561,220 +10752,288 @@@ 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr ""
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr ""
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|usar mode de frase secreta N"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "erro na criação da frase secreta: %s\n"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|usar NOME como chave secreta por omissão"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOME|cifrar para NOME"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "não consegui processar a URI do servidor de chaves\n"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
#, 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:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "erro na rede"
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
msgid "Passphrase Entry"
msgstr "frase secreta incorrecta"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
#, fuzzy
msgid "Component not suitable for launching"
msgstr "chave pública não encontrada"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "erro na leitura de `%s': %s\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "erro na leitura de `%s': %s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
#, fuzzy
msgid "list global configuration file"
msgstr "criado um novo ficheiro de configuração `%s'\n"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
#, fuzzy
msgid "check global configuration file"
msgstr "criado um novo ficheiro de configuração `%s'\n"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "actualizar a base de dados de confiança"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "usar como ficheiro de saída"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
#, fuzzy
msgid "Component not found"
msgstr "chave pública não encontrada"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
#, fuzzy
msgid "No argument allowed"
msgstr "a escrever chave privada para `%s'\n"
diff --cc po/ro.po
index e6868e8,bf4daec..95083d1
--- a/po/ro.po
+++ b/po/ro.po
@@@ -9,8 -9,7 +9,8 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.4.2rc1\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-11-20 12:04+0100\n"
- "PO-Revision-Date: 2005-05-31 22:00-0500\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
+ "PO-Revision-Date: 2017-12-19 12:30+0100\n"
"Last-Translator: Laurentiu Buzdugan <lbuz at rolix.org>\n"
"Language-Team: Romanian <translation-team-ro at lists.sourceforge.net>\n"
"Language: ro\n"
@@@ -162,26 -133,11 +162,26 @@@ msgstr "frază-parolă incorectă
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritm rezumat %d nu este suportat\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -394,8 -311,6 +394,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "schimbă fraza-parolă"
- #: agent/gpg-agent.c:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -405,124 -320,92 +405,124 @@@ msgstr "
"Opţiuni:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "Cheia este înlocuită"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "locvace"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "fii oarecum mai tăcut"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 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:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualizează baza de date de încredere"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, 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:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "eroare la crearea frazei-parolă: %s\n"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
#, fuzzy
msgid "allow presetting passphrase"
msgstr "eroare la crearea frazei-parolă: %s\n"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "nu este suportat(ă)"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -531,168 -414,120 +531,163 @@@ msgstr "nu este suportat(ă)
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "algoritm rezumat selectat este invalid\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 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:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, 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:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "nu pot crea `%s': %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
#, 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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "eroare la obţinere noului PIN: %s\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, 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:2241 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:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "scriu cheia secretă în `%s'\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "fstat(%d) a eşuat în %s: %s\n"
- #: agent/gpg-agent.c:2327
++#: agent/gpg-agent.c:2351
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "%s: nu pot crea director: %s\n"
- #: agent/gpg-agent.c:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2771
++#: agent/gpg-agent.c:2795
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "actualizarea secretului a eşuat: %s\n"
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: sărită: %s\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
@@@ -708,8 -541,6 +703,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -717,9 -548,6 +712,9 @@@ msgstr "
"@Comenzi:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -776,8 -596,6 +771,8 @@@ msgstr "anulată
msgid "error while asking for the passphrase: %s\n"
msgstr "eroare la crearea frazei-parolă: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "eroare în `%s': %s\n"
@@@ -963,8 -746,6 +958,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "eroare la citire `%s': %s\n"
@@@ -1442,7 -1125,6 +1437,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
#, fuzzy
msgid "out of core\n"
msgstr "neforţat(ă)"
@@@ -1501,8 -1172,6 +1496,8 @@@ msgstr "cheia publică %s nu a fost gă
msgid "waiting for lock %s...\n"
msgstr "scriu cheia secretă în `%s'\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1687,8 -1319,6 +1682,8 @@@ msgstr "cardul OpenPGP nu e disponibil
msgid "OpenPGP card no. %s detected\n"
msgstr "cardul OpenPGP nr. %s detectat\n"
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
msgid "can't do this in batch mode\n"
msgstr "nu pot face acest lucru în modul batch\n"
@@@ -1702,10 -1330,6 +1697,10 @@@ msgstr "Această comandă nu este permi
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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Selecţia d-voastră? "
@@@ -1762,17 -1373,11 +1757,17 @@@ msgstr "Eroare: Nume combinat prea lun
msgid "URL to retrieve public key: "
msgstr "URL pentru a aduce cheia publică: "
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, 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:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "eroare la scrierea inelului de chei `%s': %s\n"
@@@ -1822,7 -1416,6 +1817,7 @@@ msgstr "operaţia pe cheie nu e posibil
msgid "not an OpenPGP card"
msgstr "nu este un card OpenPGP"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, c-format
msgid "error getting current key info: %s\n"
msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
@@@ -1858,13 -1445,10 +1853,13 @@@ msgstr "Ce lungime de cheie doriţi? (%
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr ""
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: 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:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 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"
@@@ -1923,9 -1497,6 +1918,9 @@@ msgstr " (2) Cheie de cifrare\n
msgid " (3) Authentication key\n"
msgstr " (3) Cheie de autentificare\n"
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Selecţie invalidă.\n"
@@@ -2057,22 -1598,14 +2052,22 @@@ msgstr "--output nu merge pentru aceast
msgid "can't open '%s'\n"
msgstr "nu pot deschide `%s'\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "eroare la citire keyblock: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
#| msgid "key \"%s\" not found: %s\n"
msgid "key \"%s\" not found\n"
@@@ -2169,8 -1684,6 +2164,8 @@@ msgstr "
"AVERTISMENT: forţând cifrul simetric %s (%d) violaţi preferinţele "
"destinatarului\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, 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"
@@@ -2200,7 -1709,6 +2195,7 @@@ msgstr "forţând cifrul simetric %s (%
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrat pentru: \"%s\"\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2325,26 -1809,20 +2320,26 @@@ msgstr "%s: sărită: %s\n
msgid "writing to '%s'\n"
msgstr "scriu în `%s'\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, 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:1904
++#: g10/export.c:1909
msgid "exporting secret keys not allowed\n"
msgstr "exportul cheilor secrete nu este permis\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "AVERTISMENT: nimic exportat\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2354,13 -1831,10 +2349,13 @@@ msgstr "eroare la creearea `%s': %s\n
msgid "[User ID not found]"
msgstr "[ID utilizator nu a fost găsit]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opţiuni enumerare invalide\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2370,60 -1843,49 +2365,60 @@@
msgid "error looking up: %s\n"
msgstr "eroare în `%s': %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "eroare la crearea inelului de chei `%s': %s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "eroare la creearea `%s': %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "eroare la creearea `%s': %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
#, fuzzy
msgid "No fingerprint"
msgstr "Amprenta CA: "
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "folosim subcheia %s în loc de cheia primară %s\n"
- #: g10/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "opţiuni enumerare invalide\n"
@@@ -2632,7 -2048,6 +2627,7 @@@ msgstr "foloseşte modul text canonic
msgid "|FILE|write output to FILE"
msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "nu face nici o schimbare"
@@@ -3056,7 -2398,6 +3051,7 @@@ msgstr "%s:%d: opţiuni verificare inva
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTISMENT: programul ar putea crea un fişier core!\n"
@@@ -3075,7 -2413,6 +3070,7 @@@ msgstr "%s nu este permis cu %s!\n
msgid "%s makes no sense with %s!\n"
msgstr "%s nu are sens cu %s!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr ""
@@@ -3084,7 -2420,6 +3079,7 @@@
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:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritm cifrare selectat este invalid\n"
@@@ -3147,8 -2468,6 +3142,8 @@@ msgstr "preferinţe compresie personal
msgid "%s does not yet work with %s\n"
msgstr "%s nu merge încă cu %s!\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 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"
@@@ -3283,7 -2576,6 +3278,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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|scrie informaţii de stare în acest FD"
@@@ -3898,13 -3074,10 +3893,14 @@@ msgstr "
msgid "User ID \"%s\" is revoked."
msgstr "ID utilizator \"%s\" a fost revocat."
+#: g10/keyedit.c:568 g10/keyedit.c:596 g10/keyedit.c:623 g10/keyedit.c:807
+#: g10/keyedit.c:1651
+ #, fuzzy
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)"
+ msgstr "Sunteţi sigur(ă) că doriţi să ştergeţi permanent? (d/N)"
+#: g10/keyedit.c:582 g10/keyedit.c:610 g10/keyedit.c:637 g10/keyedit.c:813
+#: g10/keyedit.c:1656 g10/keyedit.c:2662
msgid " Unable to sign.\n"
msgstr " Nu pot semna.\n"
@@@ -4640,7 -3659,6 +4636,7 @@@ msgstr "Sunteţi încă sigur(ă) că d
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Nu puteţi adăuga o poză ID la o cheie stil PGP2.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr ""
@@@ -4946,53 -3903,41 +4942,53 @@@ msgstr "prea multe preferinţe de rezum
msgid "too many compression preferences\n"
msgstr "prea multe preferinţe de compresie\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, fuzzy, c-format
#| msgid "invalid item `%s' in preference string\n"
msgid "invalid item '%s' in preference string\n"
msgstr "articol invalid `%s' în şirul de preferinţe\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "scriu semnătură directă\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "scriu auto semnătură\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "scriu semnătură legată de cheie\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "lungime cheie invalidă; folosesc %u biţi\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "lungime cheie rotunjită la %u biţi\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
msgid "Sign"
msgstr "Semnează"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
msgid "Encrypt"
msgstr "Cifrează"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr "Autentifică"
@@@ -5006,158 -3951,127 +5002,158 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr "SsCcAaTt"
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Acţiuni posibile pentru o cheie %s: "
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr "Acţiuni permise curent: "
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Comută capabilitatea de semnare\n"
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Comută capabilitatea de cifrare\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Comută capabilitatea de autentificare\n"
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Terminat\n"
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Selectaţi ce fel de cheie doriţi:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA şi Elgamal (implicit)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA şi Elgamal (implicit)\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (numai semnare)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (numai semnare)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (numai cifrare)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (numai cifrare)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (setează singur capabilităţile)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (setează singur capabilităţile)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA şi Elgamal (implicit)\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (numai semnare)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, fuzzy, c-format
#| msgid " (%d) DSA (set your own capabilities)\n"
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) DSA (setează singur capabilităţile)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (numai cifrare)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (2) Cheie de cifrare\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Notare semnătură: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Nici o subcheie cu indicele %d\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "rotunjită prin adaos la %u biţi\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "cheile %s pot avea lungimea între %u şi %u biţi.\n"
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Ce lungime de cheie doriţi? (%u) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Ce lungime de cheie doriţi? (%u) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Lungimea cheii necesară este %u biţi\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Selectaţi ce fel de cheie doriţi:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5173,7 -4087,6 +5169,7 @@@ msgstr "
" <n>m = cheia expiră în n luni\n"
" <n>y = cheia expiră în n ani\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5189,38 -4102,30 +5185,38 @@@ msgstr "
" <n>m = semnătura expiră în n luni\n"
" <n>y = semnătura expiră în n ani\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "Cheia este validă pentru? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Semnătura este validă pentru? (%s) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "valoare invalidă\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
msgid "Key does not expire at all\n"
msgstr "Cheia nu expiră deloc\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
msgid "Signature does not expire at all\n"
msgstr "Semnătura nu expiră deloc\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, c-format
msgid "Key expires at %s\n"
msgstr "Cheia expiră pe %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, c-format
msgid "Signature expires at %s\n"
msgstr "Semnătura expiră pe %s\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5228,11 -4133,9 +5224,11 @@@ msgstr "
"Sistemul d-voastră nu poate afişa date după 2038.\n"
"Totuşi, acestea vor fi corect mânuite până în 2106.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
msgid "Is this correct? (y/N) "
msgstr "Este aceasta corect? (d/N) "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5243,7 -4146,6 +5239,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5260,50 -4162,39 +5256,50 @@@ msgstr "
" \"Popa Ioan (popică) <popa.ioan at compania.ro>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Nume real: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Caracter invalid în nume\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "Numele nu poate începe cu o cifră\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "Numele trebuie să fie de cel puţin 5 caractere\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "Adresă de email: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "Nu este o adresă de email validă\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Comentariu: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Caracter invalid în comentariu\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Folosiţi setul de caractere `%s'\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5314,7 -4205,6 +5310,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Vă rugăm nu puneţi adresa de email în numele real sau comentariu\n"
@@@ -5329,35 -4219,28 +5325,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoTt"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Schimbă (N)ume, (C)omentariu, (E)mail sau (T)Termină? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Schimbă (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termină? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Schimbă (N)ume, (C)omentariu, (E)mail sau (T)Termină? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Schimbă (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termină? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Vă rugăm corectaţi mai întâi eroarea\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5369,13 -4252,10 +5365,13 @@@ msgstr "
"în timpul generării numerelor prime; aceasta dă o şansă generatorului de\n"
"numere aleatoare o şansă mai bună de a aduna destulă entropie.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generarea cheii a eşuat: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5383,71 -4263,58 +5379,71 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "cheia există deja\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "Creaţi oricum? "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "Creaţi oricum? "
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Generarea cheii a fost anulată.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, fuzzy, c-format
#| msgid "can't create backup file `%s': %s\n"
msgid "can't create backup file '%s': %s\n"
msgstr "nu pot crea fişier de rezervă `%s': %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "NOTĂ: copia de siguranţa a cheii cardului salvată la `%s'\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "scriu cheia publică în `%s'\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nu am găsit nici un inel de chei public de scris: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "cheile secretă şi publică au fost create şi semnate.\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
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"
@@@ -5457,7 -4324,6 +5453,7 @@@ msgstr "
"să folosiţi comanda \"--edit-key\" pentru a genera o subcheie secundară\n"
"pentru acest scop.\n"
- #: g10/keygen.c:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5465,7 -4331,6 +5461,7 @@@ msgstr "
"cheia a fost creată %lu secundă în viitor (warp în timp sau probleme cu "
"ceasul)\n"
- #: g10/keygen.c:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5473,21 -4338,17 +5469,21 @@@ msgstr "
"cheia a fost creată %lu secunde în viitor (warp în timp sau probleme cu "
"ceasul)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
#, 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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
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:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
msgid "Really create? (y/N) "
msgstr "Creaţi într-adevăr? (d/N) "
@@@ -6245,23 -4960,18 +6241,23 @@@ msgstr "Este această poză corectă (d
msgid "unable to display photo ID!\n"
msgstr "nu pot afişa poza ID!\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Nici un motiv specificat"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "Cheia este înlocuită"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "Cheia a fost compromisă"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "Cheia nu mai este folosită"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "ID utilizator nu mai este valid"
@@@ -6339,7 -5036,6 +6335,7 @@@ msgstr "
"Nivelul minim de încredere pentru această cheie este: %s\n"
"\n"
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Decizia d-voastră? "
@@@ -6490,46 -5158,37 +6486,46 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Nu este sigur că semnătura aparţine proprietarului.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: sărită: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: sărită: cheia publică este deactivată\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: sărită: cheia publică este deja prezentă\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "nu mă pot conecta la `%s': %s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Nu aţi specificat un ID utilizator. (puteţi folosi \"-r\")\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr "Destinatari curenţi:\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6537,37 -5196,29 +6533,37 @@@ msgstr "
"\n"
"Introduceţi ID-ul utilizator. Terminaţi cu o linie nouă: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Nu există acest ID utilizator.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "sărită: cheia publică setată deja ca destinatar implicit\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "Cheia publică este deactivată.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "sărită: cheia publică setată deja\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatar implicit necunoscut \"%s\"\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "nici un destinatar valid\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "cheia %s nu are nici un ID utilizator\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "cheia %s nu are nici un ID utilizator\n"
@@@ -6675,7 -5304,6 +6671,7 @@@ msgstr "Cheia secretă este disponibil�
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Creaţi un certificat de revocare desemnat pentru această cheie? (d/N) "
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "Ieşire în armură ASCII forţată.\n"
@@@ -6693,20 -5318,17 +6689,20 @@@ msgstr "Certificat de revocare creat.\n
msgid "no revocation keys found for \"%s\"\n"
msgstr "nici o cheie de revocare găsită pentru \"%s\"\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Creaţi un certificat de revocare pentru această cheie? (d/N) "
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6715,20 -5337,17 +6711,20 @@@
"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:577
++#: g10/revoke.c:590
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Certificat de revocare creat.\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6737,22 -5356,18 +6733,22 @@@ msgstr "cheia secretă \"%s\" nu a fos
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "eroare la crearea inelului de chei `%s': %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Creaţi un certificat de revocare pentru această cheie? (d/N) "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6770,33 -5385,26 +6766,33 @@@ msgstr "
"caz că mediumul este deteriorat. Dar fiţi atent: sistemul de tipărire al\n"
"maşinii d-voastră ar putea păstra datele şi să le facă accesibile altora!\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Vă rugăm selectaţi motivul pentru revocare:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Renunţă"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Probabil doriţi să selectaţi %d aici)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Introduceţi o descriere opţională; terminaţi cu o linie goală:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Motiv pentru revocare: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(Nici o descriere dată)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
msgid "Is this okay? (y/N) "
msgstr "Este aceasta OK? (d/N) "
@@@ -7213,10 -5747,6 +7209,10 @@@ msgstr "eroare la crearea frazei-parol�
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
@@@ -7248,7 -5773,6 +7244,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "eroare în `%s': %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
@@@ -7561,18 -6036,14 +7557,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7637,7 -6096,6 +7633,7 @@@ msgstr "folosesc model de încredere %s
msgid "no need for a trustdb check\n"
msgstr "nu e nevoie de o verificare trustdb\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "următoarea verificare trustdb programată pe %s\n"
@@@ -7667,7 -6120,6 +7663,7 @@@ msgstr "vă rugăm faceţi un --check-t
msgid "checking the trustdb\n"
msgstr "verific trustdb\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
#| msgid "%lu keys processed so far\n"
msgid "%d key processed"
@@@ -7675,7 -6127,6 +7671,7 @@@ msgid_plural "%d keys processed
msgstr[0] "%lu chei procesate până acum\n"
msgstr[1] "%lu chei procesate până acum\n"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7683,23 -6134,19 +7679,23 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d chei procesate (%d numărători valide anulate)\n"
msgstr[1] "%d chei procesate (%d numărători valide anulate)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "nu am găsit nici o cheie cu încredere supremă\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "cheia publică a cheii cu încredere supremă %s nu a fost găsită\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
"adânc: %d valid: %3d semnat: %3d încredere: %d-, %dq, %dn, %dm, %df, %du\n"
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -8131,76 -6492,60 +8127,76 @@@ msgstr "||Vă rugăm introduceţi PIN%%
msgid "|N|Initial New PIN"
msgstr "|N|PIN Nou"
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr ""
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
#, fuzzy
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NUME|foloseşte NUME ca destinatar implicit"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
#, fuzzy
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NUME|foloseşte NUME ca destinatar implicit"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
#, fuzzy
msgid "do not use the internal CCID driver"
msgstr "nu folosi deloc terminalul"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr ""
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr ""
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
#, fuzzy
msgid "deny the use of admin card commands"
msgstr "arată comenzi administrare"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8924,7 -7116,6 +8920,7 @@@ msgstr "adaugă acest inel de chei la l
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|foloseşte acest server de chei pentru a căuta chei"
@@@ -8985,17 -7166,14 +8981,17 @@@ msgstr " s = sări peste cheia asta\n
msgid "could not parse keyserver\n"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "eroare la obţinerea numărului serial: %s\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "nu pot accesa `%s': %s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9956,118 -7944,90 +9952,118 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
#, 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:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
#
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10080,95 -8040,76 +10076,95 @@@ msgstr "
"@\n"
"(Arată pagina man pentru o listă completă a comenzilor şi opţiunilor)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "folosire: gpg [opţiuni] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
#, 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:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, 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:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "linie prea lungă"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "amprentă invalidă"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, 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:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "neforţat(ă)"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10623,78 -8473,62 +10619,78 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "semnarea a eşuat: %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "semnarea a eşuat: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "stergere keyblock a eşuat: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "stergere keyblock a eşuat: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "stergere keyblock a eşuat: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, 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:2603
++#: dirmngr/server.c:2709
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: am eşuat să creez hashtable: %s\n"
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
#, 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:2632
++#: dirmngr/server.c:2738
#, 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:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10738,7 -8564,6 +10734,7 @@@ msgstr "preferinţa `%s' duplicată\n
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
#, fuzzy
msgid "quiet"
msgstr "termină"
@@@ -10831,288 -8636,220 +10827,288 @@@ 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr ""
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr ""
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|foloseşte modul frază-parolă N"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "eroare la crearea frazei-parolă: %s\n"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NUME|cifrare pentru NUME"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr ""
#
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NUME|foloseşte algoritm cifrare NUME pentru fraza-parolă"
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "eroare reţea"
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
msgid "Passphrase Entry"
msgstr "frază-parolă incorectă"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
#, fuzzy
msgid "Component not suitable for launching"
msgstr "cheia publică nu a fost găsită"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "eroare în `%s': %s\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error parsing '%s'\n"
msgstr "eroare în `%s': %s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
#, fuzzy
msgid "list global configuration file"
msgstr "articol configurare necunoscut `%s'\n"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
#, fuzzy
msgid "check global configuration file"
msgstr "articol configurare necunoscut `%s'\n"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "actualizează baza de date de încredere"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "foloseşte ca fişier ieşire"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
#, fuzzy
msgid "Component not found"
msgstr "cheia publică nu a fost găsită"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
#, fuzzy
msgid "No argument allowed"
msgstr "Nu sunt permise comenzi administrare\n"
diff --cc po/ru.po
index 972b19e,793bb0b..fda8ac0
--- a/po/ru.po
+++ b/po/ru.po
@@@ -11,8 -11,7 +11,8 @@@ msgid "
msgstr ""
"Project-Id-Version: GnuPG 2.2.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2017-11-20 12:04+0100\n"
- "PO-Revision-Date: 2017-11-02 17:41+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
+ "PO-Revision-Date: 2017-12-13 17:41+0100\n"
"Last-Translator: Ineiev <ineiev at gnu.org>\n"
"Language-Team: Russian <gnupg-ru at gnupg.org>\n"
"Language: ru\n"
@@@ -155,25 -126,10 +155,25 @@@ msgstr "Неверная фраза-п�
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:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, c-format
msgid "can't open '%s': %s\n"
msgstr "не могу открыть '%s': %s\n"
@@@ -380,8 -297,6 +380,8 @@@ msgstr "Введите фразу-па�
msgid "Please enter the new passphrase"
msgstr "Введите новую фразу-пароль"
- #: agent/gpg-agent.c:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -389,133 -304,94 +389,133 @@@ msgstr "
"@Параметры:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr "запуск в режиме демона (фоновый режим)"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr "запуск в режиме сервера (нефоновый режим)"
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
msgid "run in supervised mode"
msgstr "запуск в подконтрольном режиме"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "подробно"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "сократить подробности"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr "вывод команд в стиле sh"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr "вывод команд в стиле csh"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|FILE|взять параметры из файла FILE"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr "не отсоединяться от консоли"
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "использовать файл журнала для сервера"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|использовать программу PGM для ввода паролей"
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|использовать программу PGM как демон криптографических карт"
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
msgid "do not use the SCdaemon"
msgstr "не использовать демон криптографических карт"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|принимать некоторые команды по NAME"
- #: agent/gpg-agent.c:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr "игнорировать запросы смены терминала"
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr "игнорировать запросы смены дисплея XWindow"
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|сбрасывать запомненный PIN через N секунд"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr "не использовать запомненный PIN при подписывании"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
msgid "disallow the use of an external password cache"
msgstr "не позволять пользоваться внешней памятью паролей"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr "не позволять клиентам помечать ключи как \"доверенные\""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
msgid "allow presetting passphrase"
msgstr "разрешить предустанавливать фразу-пароль"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
"не позволять вызывающей программе замещать собой программу ввода пароля"
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr "разрешить ввод фразы-пароля через Emacs"
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
msgid "enable ssh support"
msgstr "включить поддержку ssh"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr "|ALGO|использовать для отображения отпечатков алгоритм ALGO"
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
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:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Об ошибках в программе сообщайте по адресу <@EMAIL@>.\n"
- #: agent/gpg-agent.c:513
++#: agent/gpg-agent.c:523
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Вызов: @GPG_AGENT@ [параметры] (-h - подсказка)"
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -523,140 -399,99 +523,135 @@@ msgstr "
"Синтаксис: @GPG_AGENT@ [параметры] [команда [аргументы]]\n"
"Управление секретными ключами для @GNUPG@\n"
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "запрошен недопустимый уровень отладки '%s'\n"
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "выбрана недопустимая хеш-функция\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "Замечание: основной файл параметров '%s' не обнаружен\n"
- #: agent/gpg-agent.c:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "файл параметров '%s': %s\n"
- #: agent/gpg-agent.c:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, c-format
msgid "reading options from '%s'\n"
msgstr "чтение параметров из '%s'\n"
- #: agent/gpg-agent.c:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Замечание: '%s' не считается параметром\n"
- #: agent/gpg-agent.c:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, c-format
msgid "can't create socket: %s\n"
msgstr "не могу создать сокет: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "слишком длинное имя сокета '%s'\n"
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "агент gpg уже запущен - еще один, новый, запущен не будет\n"
- #: agent/gpg-agent.c:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
msgid "error getting nonce for the socket\n"
msgstr "ошибка получения разового кода для сокета\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "ошибка связывания сокета с '%s': %s\n"
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "не удалось задать права доступа для '%s': %s\n"
- #: agent/gpg-agent.c:2241 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
- #, c-format
- msgid "listen() failed: %s\n"
- msgstr "сбой listen(): %s\n"
-
- #: agent/gpg-agent.c:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, c-format
msgid "listening on socket '%s'\n"
msgstr "слушаем сокет '%s'\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "сбой stat() для '%s': %s\n"
- #: agent/gpg-agent.c:2327
++#: agent/gpg-agent.c:2351
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "невозможно использовать '%s' как домашний каталог\n"
- #: agent/gpg-agent.c:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "ошибка чтения разового кода из файлового дескриптора %d: %s\n"
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "обработчик 0x%lx для файлового дескриптора %d запущен\n"
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "обработчик 0x%lx для файлового дескриптора %d завершился\n"
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "обработчик ssh 0x%lx для файлового дескриптора %d запущен\n"
- #: agent/gpg-agent.c:2771
++#: agent/gpg-agent.c:2795
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "обработчик ssh 0x%lx для файлового дескриптора %d завершился\n"
- #: agent/gpg-agent.c:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "сбой npth_pselect: %s - жду 1 секунду\n"
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s остановлен\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "в этом сеансе агент gpg не работает\n"
@@@ -672,8 -505,6 +667,8 @@@ msgstr "
"Синтаксис: gpg-preset-passphrase [параметры] КОД_КЛЮЧА\n"
"Работа с буфером паролей\n"
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -681,9 -512,6 +676,9 @@@ msgstr "
"@Команды:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -737,8 -557,6 +732,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:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, c-format
msgid "error opening '%s': %s\n"
msgstr "ошибка открытия '%s': %s\n"
@@@ -923,8 -706,6 +918,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, c-format
msgid "error forking process: %s\n"
msgstr "ошибка при дублировании процесса: %s\n"
@@@ -1360,7 -1043,6 +1355,7 @@@ msgstr "параметр \"%.50s\" не
msgid "command \"%.50s\" is ambiguous\n"
msgstr "команда \"%.50s\" неоднозначна\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
msgid "out of core\n"
msgstr "нехватка выделенной памяти\n"
@@@ -1418,8 -1089,6 +1413,8 @@@ msgstr "блокировка '%s' не
msgid "waiting for lock %s...\n"
msgstr "ожидаю снятия блокировки %s...\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "слишком старая версия %s (нужно %s, есть %s)\n"
@@@ -1591,8 -1223,6 +1586,8 @@@ msgstr "Карта OpenPGP недост
msgid "OpenPGP card no. %s detected\n"
msgstr "Обнаружена карта OpenPGP номер %s\n"
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
msgid "can't do this in batch mode\n"
msgstr "в пакетном режиме это действие невозможно\n"
@@@ -1604,10 -1232,6 +1599,10 @@@ msgstr "Эта команда дост�
msgid "Reset Code not or not anymore available\n"
msgstr "Код сброса (больше) не доступен\n"
+#: g10/card-util.c:142 g10/card-util.c:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Ваш выбор? "
@@@ -1664,16 -1275,10 +1659,16 @@@ msgstr "Ошибка: Слишком д
msgid "URL to retrieve public key: "
msgstr "URL для получения открытого ключа: "
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, c-format
msgid "error reading '%s': %s\n"
msgstr "ошибка чтения '%s': %s\n"
- #: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "ошибка записи '%s': %s\n"
@@@ -1723,7 -1317,6 +1718,7 @@@ msgstr "операция с ключо�
msgid "not an OpenPGP card"
msgstr "это не карта OpenPGP"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, c-format
msgid "error getting current key info: %s\n"
msgstr "ошибка при считывании информации ключа: %s\n"
@@@ -1757,19 -1345,14 +1752,18 @@@ msgstr "Какой Вам нужен р
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Какой Вам нужен размер ключа для удостоверения личности? (%u) "
+#: g10/card-util.c:1358
- #, fuzzy, c-format
- #| msgid "The card will now be re-configured to generate a key of %u bits\n"
+ #, c-format
msgid "The card will now be re-configured to generate a key of type: %s\n"
- msgstr "Теперь карта будет перенастроена на генерацию ключа длиной %u бит\n"
+ msgstr "Теперь карта будет перенастроена на генерацию ключа типа %s\n"
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "округлен до %u бит\n"
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "размер ключей %s должен быть в пределах %u-%u\n"
@@@ -1823,9 -1396,6 +1817,9 @@@ msgstr " (2) Ключ шифрова�
msgid " (3) Authentication key\n"
msgstr " (3) Ключ удостоверения личности\n"
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Неправильный выбор.\n"
@@@ -1951,22 -1491,14 +1945,22 @@@ msgstr "--output для данной к
msgid "can't open '%s'\n"
msgstr "не могу открыть '%s'\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "ошибка чтения блока ключей: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, c-format
msgid "key \"%s\" not found\n"
msgstr "ключ \"%s\" не найден\n"
@@@ -2055,8 -1569,6 +2049,8 @@@ msgstr "
"Внимание: принудительное использование симметричного шифра %s (%d)\n"
" нарушает предпочтения получателя\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, c-format
msgid "cipher algorithm '%s' may not be used in %s mode\n"
msgstr "алгоритм шифрования '%s' нельзя использовать в режиме %s\n"
@@@ -2085,7 -1593,6 +2079,7 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s зашифровано для пользователя \"%s\"\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, c-format
msgid "option '%s' may not be used in %s mode\n"
msgstr "параметр '%s' нельзя использовать в режиме %s\n"
@@@ -2200,26 -1683,20 +2194,26 @@@ msgstr " - пропущено
msgid "writing to '%s'\n"
msgstr "сохраняю в '%s'\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "ключ %s: материал ключа на карте - пропущен\n"
- #: g10/export.c:1904
++#: g10/export.c:1909
msgid "exporting secret keys not allowed\n"
msgstr "экспорт секретных ключей не разрешен\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "ключ %s: ключ типа PGP 2.x - пропущен\n"
- #: g10/export.c:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "Внимание: нечего экспортировать\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/plaintext.c:167 g10/plaintext.c:190
#, c-format
msgid "error creating '%s': %s\n"
msgstr "ошибка создания '%s': %s\n"
@@@ -2228,13 -1704,10 +2222,13 @@@
msgid "[User ID not found]"
msgstr "[Идентификатор пользователя не найден]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(проверьте аргумент параметра '%s')\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2245,59 -1717,48 +2239,59 @@@
msgid "error looking up: %s\n"
msgstr "ошибка поиска: %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, c-format
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "Внимание: %s включено в таблицу ключей %d раз\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "автоматически получили '%s' через %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "ошибка получения '%s' через %s: %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
msgid "No fingerprint"
msgstr "Нет отпечатка"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "секретный ключ \"%s\" не найден: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, c-format
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "Внимание: '%s' не используется в качестве основного ключа: %s\n"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, c-format
msgid "using \"%s\" as default secret key for signing\n"
msgstr ""
"\"%s\" используется в качестве основного секретного ключа для подписи\n"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr "все значения, переданные в '%s', игнорируются\n"
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Параметр --allow-non-selfsigned-uid сделал недостоверный ключ %s "
"достоверным\n"
- #: g10/getkey.c:3716
++#: g10/getkey.c:3724
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "использую подключ %s вместо первичного ключа %s\n"
- #: g10/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, c-format
msgid "valid values for option '%s':\n"
msgstr "недопустимые значения для параметра \"%s\"\n"
@@@ -2486,7 -1901,6 +2480,7 @@@ msgstr "использовать кан
msgid "|FILE|write output to FILE"
msgstr "|FILE|выводить данные в файл FILE"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "не делать никаких изменений"
@@@ -2861,7 -2202,6 +2855,7 @@@ msgstr "%s:%d: недопустимы�
msgid "invalid auto-key-locate list\n"
msgstr "недопустимый список auto-key-locate\n"
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "Внимание: возможно создание файла образа памяти!\n"
@@@ -2880,7 -2217,6 +2874,7 @@@ msgstr "%s с %s недопустимо
msgid "%s makes no sense with %s!\n"
msgstr "%s с %s не имеет смысла!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr "Внимание: работаем с фальшивым системным временем: "
@@@ -2889,7 -2224,6 +2883,7 @@@
msgid "will not run with insecure memory due to %s\n"
msgstr "отказываюсь работать с небезопасной памятью из-за %s\n"
- #: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "выбран недопустимый алгоритм шифрования\n"
@@@ -2950,8 -2270,6 +2944,8 @@@ msgstr "недопустимые лич
msgid "%s does not yet work with %s\n"
msgstr "%s пока не работает совместно с %s!\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 sm/sign.c:478 sm/verify.c:473
#, c-format
msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "хеш-функцию '%s' нельзя использовать в режиме %s\n"
@@@ -3079,7 -2371,6 +3073,7 @@@ msgstr "|FILE|взять ключи и�
msgid "make timestamp conflicts only a warning"
msgstr "при несоответствии метки времени - только предупреждение"
- #: g10/gpgv.c:84 sm/gpgsm.c:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|выводить информацию в файл с дескриптором FD"
@@@ -4394,7 -3411,6 +4388,7 @@@ msgstr "Вы уверены, что х�
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Нельзя добавить фотоидентификатор в ключ типа PGP2.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr "Такой идентификатор пользователя на этом ключе уже есть!\n"
@@@ -4687,54 -3642,42 +4681,54 @@@ msgstr "слишком много пр�
msgid "too many compression preferences\n"
msgstr "слишком много предпочтений методов сжатия\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "недопустимый элемент '%s' в строке предпочтений\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "запись прямой подписи\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "запись самоподписи\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "запись связующей подписи\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "неверный размер ключа; использую %u бит\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "размер ключа округлен вверх до %u бит\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"Внимание: некоторые реализации OpenPGP не могут обрабатывать ключи DSA с "
"такой длиной хеша\n"
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
msgid "Sign"
msgstr "Подписать"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr "Заверить"
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
msgid "Encrypt"
msgstr "Зашифровать"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr "Удостоверить личность"
@@@ -4748,150 -3691,119 +4742,150 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr "11223300"
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Возможные действия для ключа %s: "
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr "Допустимы действия: "
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Переключить возможность подписи\n"
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Переключить возможность шифрования\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Переключить возможность удостоверения личности\n"
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Завершено\n"
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Выберите тип ключа:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA и RSA (по умолчанию)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA и Elgamal\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (только для подписи)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (только для подписи)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (только для шифрования)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (только для шифрования)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (задать возможности)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (задать возможности)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) ECC и ECC\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, c-format
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) ECC (только для подписи)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) ECC (задать возможности)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, c-format
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) ECC (только для шифрования)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) Имеющийся ключ\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
msgid "Enter the keygrip: "
msgstr "Введите код ключа:"
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "Недопустимый код ключа (ожидается 40 шестнадцатеричных цифр)\n"
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
msgid "No key with this keygrip\n"
msgstr "Нет ключа с таким кодом\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, c-format
msgid "rounded to %u bits\n"
msgstr "округлен до %u бит\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "длина ключей %s может быть от %u до %u.\n"
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Какой размер подключа необходим? (%u) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Какой размер ключа Вам необходим? (%u) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Запрошенный размер ключа - %u бит\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
msgid "Please select which elliptic curve you want:\n"
msgstr "Выберите эллиптическую кривую:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -4907,7 -3819,6 +4901,7 @@@ msgstr "
" <n>m = срок действия ключа - n месяцев\n"
" <n>y = срок действия ключа - n лет\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -4923,38 -3834,30 +4917,38 @@@ msgstr "
" <n>m = срок действия подписи - n месяцев\n"
" <n>y = срок действия подписи - n лет\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "Срок действия ключа? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Срок действия подписи? (%s) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "недопустимое значение\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
msgid "Key does not expire at all\n"
msgstr "Срок действия ключа не ограничен\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
msgid "Signature does not expire at all\n"
msgstr "Срок действия подписи не ограничен\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, c-format
msgid "Key expires at %s\n"
msgstr "Ключ действителен до %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, c-format
msgid "Signature expires at %s\n"
msgstr "Подпись действительна до %s\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -4962,11 -3865,9 +4956,11 @@@ msgstr "
"Ваша система не может отображать даты после 2038 года.\n"
"Однако даты до 2106 года будут обрабатываться верно.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
msgid "Is this correct? (y/N) "
msgstr "Все верно? (y/N) "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4980,7 -3881,6 +4974,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -4996,49 -3896,38 +4990,49 @@@ msgstr "
" \"Вася Пушкин (персонаж) <vp at test.ru>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Ваше полное имя: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Недопустимый символ в имени\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr "Символы '%s' и '%s' в имени появляться не могут\n"
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "Имя не должно начинаться с цифры\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "Имя не должно быть короче 5 символов\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "Адрес электронной почты: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "Неправильный адрес электронной почты\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Примечание: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Недопустимый символ в примечании\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "Используется таблица символов '%s'.\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5049,7 -3938,6 +5043,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Не вставляйте адрес электронной почты в имя пользователя или примечание\n"
@@@ -5065,31 -3953,24 +5059,31 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Сменить (N)Имя, (C)Примечание, (E)Адрес; (Q)Выход? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Сменить (N)Имя, (C)Примечание, (E)Адрес; (O)Принять/(Q)Выход? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Сменить (N)Имя, (E)Адрес; (Q)Выход? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Сменить (N)Имя, (E)Адрес; (O)Принять/(Q)Выход? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Сначала исправьте ошибку\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5102,13 -3983,10 +5096,13 @@@ msgstr "
"случайных чисел больше возможностей получить достаточное количество "
"энтропии.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Сбой при создании ключа: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5119,63 -3997,50 +5113,63 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr "Продолжить? (Y/n) "
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Ключ пользователя \"%s\" уже существует\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
msgid "Create anyway? (y/N) "
msgstr "Все равно создать новый? (y/N) "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
msgid "creating anyway\n"
msgstr "принудительное создание\n"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
"Замечание: \"%s %s\" вызывает полнофункциональный диалог создания ключа.\n"
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Создание ключа прервано.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "не могу создать архивную копию, файл '%s': %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "Замечание: архивная копия ключа с карты сохранена в '%s'\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, c-format
msgid "writing public key to '%s'\n"
msgstr "сохранение открытого ключа в '%s'\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "ошибка записи таблицы открытых ключей '%s': %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "открытый и секретный ключи созданы и подписаны.\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5183,7 -4048,6 +5177,7 @@@ msgstr "
"Учтите, что данный ключ не может использоваться для шифрования. Можно\n"
"воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
- #: g10/keygen.c:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5191,7 -4055,6 +5185,7 @@@ msgstr "
"ключ создан на %lu секунду в будущем (петля во времени или проблемы с "
"часами)\n"
- #: g10/keygen.c:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5199,19 -4062,15 +5193,19 @@@ msgstr "
"ключ создан на %lu секунд в будущем (петля во времени или проблемы с "
"часами)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "Замечание: создание подключей для ключей v3 не совместимо с OpenPGP\n"
- #: g10/keygen.c:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
msgid "Secret parts of primary key are not available.\n"
msgstr "Секретные части первичного ключа отсутствуют.\n"
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Секретные части первичного ключа хранятся на карте.\n"
- #: g10/keygen.c:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
msgid "Really create? (y/N) "
msgstr "Действительно создать? (y/N) "
@@@ -5938,23 -4651,18 +5932,23 @@@ msgstr "Это правильная ф�
msgid "unable to display photo ID!\n"
msgstr "не могу отобразить фотоидентификатор!\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Причина не указана"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "Ключ заменен другим"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "Ключ был раскрыт"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "Ключ больше не используется"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "Идентификатор пользователя больше не действителен"
@@@ -6031,7 -4726,6 +6025,7 @@@ msgstr "
"Минимальный уровень доверия данному ключу: %s\n"
"\n"
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Ваше решение? "
@@@ -6170,45 -4836,36 +6164,45 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Нет уверенности в том, что подпись принадлежит владельцу.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: пропущено: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: пропущено: открытый ключ отключен\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: пропущено: открытый ключ уже существует\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, c-format
msgid "can't encrypt to '%s'\n"
msgstr "не могу зашифровать для '%s'\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "задан параметр '%s', но не заданы ключи по умолчанию\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "задан параметр '%s', но параметр '%s' не задан\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Не задан идентификатор пользователя (можно использовать \"-r\").\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr "Текущие получатели:\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6216,37 -4873,29 +6210,37 @@@ msgstr "
"\n"
"Введите идентификатор пользователя. Завершите пустой строкой: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Нет такого идентификатора пользователя.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "пропущено: открытый ключ уже установлен для получателя по умолчанию\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "Открытый ключ отключен.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "пропущено: открытый ключ уже установлен\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "неизвестный получатель по умолчанию \"%s\"\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "нет пригодных адресов\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Замечание: у ключа %s нет функции %s\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Замечание: у ключа %s нет предпочтения для %s\n"
@@@ -6346,7 -4973,6 +6340,7 @@@ msgstr "Секретный ключ н�
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Создать сертификат отзыва данного ключа? (y/N) "
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "Для вывода использован текстовый формат ASCII.\n"
@@@ -6364,11 -4987,9 +6358,11 @@@ msgstr "Сертификат отзыв
msgid "no revocation keys found for \"%s\"\n"
msgstr "ключи отзыва для \"%s\" не найдены\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Это сертификат отзыва ключа OpenPGP:"
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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"
@@@ -6378,7 -4999,6 +6372,7 @@@ msgstr "
"публично объявить, что ключ больше не должен применяться. После публикации\n"
"такой сертификат взять назад невозможно."
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6391,7 -5011,6 +6385,7 @@@ msgstr "
"новый сертификат с указанием причины отзыва. Подробности см. в описании\n"
"команды gpg \"--generate-revocation\" в руководстве по GnuPG."
- #: g10/revoke.c:577
++#: g10/revoke.c:590
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"
@@@ -6401,12 -5020,10 +6395,12 @@@ msgstr "
"вставлено двоеточие. Удалите это двоеточие в текстовом редакторе\n"
"перед импортированием и публикацией этого сертификата отзыва."
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, c-format
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "сертификат отзыва записан в '%s.rev'.\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, c-format
msgid "secret key \"%s\" not found\n"
msgstr "секретный ключ \"%s\" не найден\n"
@@@ -6414,21 -5031,17 +6408,21 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr "'%s' соответствует нескольким секретным ключам:\n"
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, c-format
msgid "error searching the keyring: %s\n"
msgstr "ошибка поиска в таблице ключей %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Создать сертификат отзыва данного ключа? (y/N) "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6447,33 -5060,26 +6441,33 @@@ msgstr "
"носитель будет поврежден, но будьте осторожны: система печати\n"
"Вашей машины может сохранить данные и сделать их доступными для других!\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Укажите причину отзыва:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Отмена"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Скорее всего, Вы здесь выберете %d)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Введите необязательное пояснение; завершите пустой строкой:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Причина отзыва: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(Пояснения отсутствуют)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
msgid "Is this okay? (y/N) "
msgstr "Все правильно? (y/N) "
@@@ -6877,10 -5409,6 +6871,10 @@@ msgstr "ошибка создания �
msgid "TOFU DB error"
msgstr "ошибка базы данных TOFU"
+#: 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
++#: g10/tofu.c:3408
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "ошибка чтения базы данных TOFU: %s\n"
@@@ -6910,7 -5433,6 +6904,7 @@@ msgstr "добавление столб
msgid "error opening TOFU database '%s': %s\n"
msgstr "ошибка открытия базы данных TOFU '%s': %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "ошибка обновления базы данных TOFU: %s\n"
@@@ -7265,20 -5738,16 +7259,20 @@@ msgstr[2] "
"некачественный командой\n"
" %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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "ошибка при открытии базы данных TOFU: %s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
"ВНИМАНИЕ: Шифрование для ключа %s, у которого нет неотозванных "
"идентификаторов пользователя\n"
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, c-format
msgid "error setting policy for key %s, user id \"%s\": %s"
msgstr ""
@@@ -7343,7 -5800,6 +7337,7 @@@ msgstr "использую модел�
msgid "no need for a trustdb check\n"
msgstr "проверка таблицы доверия не нужна\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "срок следующей проверки таблицы доверия %s\n"
@@@ -7371,7 -5822,6 +7365,7 @@@ msgstr "выполните --check-trus
msgid "checking the trustdb\n"
msgstr "проверка таблицы доверия\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
@@@ -7379,7 -5829,6 +7373,7 @@@ msgstr[0] "обработан %d клю
msgstr[1] "обработаны %d ключа"
msgstr[2] "обработано %d ключей"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, c-format
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
@@@ -7387,16 -5836,13 +7381,16 @@@ msgstr[0] " (сброшен %d счет
msgstr[1] " (сброшены %d счетчика достоверности)\n"
msgstr[2] " (сброшено %d счетчиков достоверности)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "абсолютно доверенных ключей не найдено\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "открытый ключ для абсолютно доверенного ключа %s не найден\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7404,7 -5850,6 +7398,7 @@@ msgstr "
"глубина: %d достоверных: %3d подписанных: %3d доверие: %d-, %dq, %dn, "
"%dm, %df, %du\n"
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -7822,55 -6181,42 +7816,55 @@@ msgstr "||Введите PIN на кл�
msgid "|N|Initial New PIN"
msgstr "|N|Первоначальный новый PIN"
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr "работать в многосерверном режиме (нефоновый режим)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|установить уровень отладки, равный LEVEL"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
msgid "|FILE|write a log to FILE"
msgstr "|FILE|сохранять журнал в файл FILE"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr "|N|подключаться к считывателю на порту N"
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NAME|использовать NAME как драйвер ct-API"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NAME|использовать NAME как драйвер PC/SC"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
msgid "do not use the internal CCID driver"
msgstr "не использовать внутренний драйвер CCID"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr "|N|отключить карту после N секунд неактивности"
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr "не использовать клавиатуру считывателя"
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
msgid "deny the use of admin card commands"
msgstr "не позволять использовать административные команды карты"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr "использовать входные данные переменой длины для клавиатуры считывателя"
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Вызов: @SCDAEMON@ [параметры] (-h - подсказка)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
@@@ -7878,17 -6224,14 +7872,17 @@@ msgstr "
"Синтаксис: scdaemon [параметры] [команда [аргументы]]\n"
"Демон криптографических карт для @GNUPG@\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
"используйте параметр '--daemon' для запуска приложения в фоновом режиме\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr "обработчик fd %d запущен\n"
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "обработчик fd %d остановлен\n"
@@@ -8572,7 -6762,6 +8566,7 @@@ msgstr "|FILE|добавить табл
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|USER-ID|использовать USER-ID как основной секретный ключ"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|искать ключи на данном сервере ключей"
@@@ -8627,17 -6806,14 +8621,17 @@@ msgstr "%s:%u: пропускаю эт�
msgid "could not parse keyserver\n"
msgstr "не удалось определить сервер ключей\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "импорт общих сертификатов '%s'\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "невозможно подписать с помощью '%s': %s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr "недопустимая команда (неявной команды нет)\n"
@@@ -9599,118 -7585,90 +9593,118 @@@ msgstr "нужно абсолютно�
msgid "looking up '%s'\n"
msgstr "поиск '%s'\n"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr "вывести содержание буфера списков отозванных сертификатов"
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|загрузить список отозванных сертификатов из файла FILE в буфер"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|получить список отозванных сертификатов из URL"
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr "выключить dirmngr"
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr "записать буфер на диск"
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr "|FILE|сохранять журнал режима сервера в файле FILE"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
msgid "run without asking a user"
msgstr "работать, не спрашивая пользователя"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr "принудительная загрузка устаревших списков отозванных сертификатов"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr "разрешить посылку запросов OCSP"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr "разрешить проверку версий программ по сети"
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr "запретить использование HTTP"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr "запретить использование LDAP"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
"игнорировать точки распространения списков отозванных сертификатов по HTTP"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
"игнорировать точки распространения списков отозванных сертификатов по LDAP"
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr "игнорировать URL служб OCSP из сертификата"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|перенаправлять все запросы HTTP на URL"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HOST|использовать хост HOST для поиска LDAP"
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "не пользоваться запасными хостами с --ldap-proxy"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|взять список серверов LDAP из файла FILE"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
"добавлять новые серверы, обнаруженные в точках распространения списков "
"отозванных сертификатов, в список серверов"
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|установить время ожидания LDAP N секунд"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|использовать ответчик OCSP по URL"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|ответ OCSP подписан сертификатом с отпечатком FPR"
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr "|N|не возвращать более чем N результатов одного поиска"
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
"|FILE|использовать сертификаты удостоверяющего центра из файла FILE для HKP "
"по TLS"
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr "проводить весь сетевой обмен через Tor"
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9719,11 -7677,9 +9713,11 @@@ msgstr "
"@\n"
"(Полный список команд и параметров см. в руководстве \"info\")\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Вызов: @DIRMNGR@ [параметры] (-h - подсказка)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9731,77 -7687,60 +9725,77 @@@ msgstr "
"Синтаксис: @DIRMNGR@ [параметры] [команда [аргументы]]\n"
"Доступ к OCSP, серверам ключей, спискам отозванных сертификатов для @GNUPG@\n"
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "допустимые уровни отладки: %s\n"
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, c-format
msgid "usage: %s [options] "
msgstr "вызов: %s [параметры] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
msgid "colons are not allowed in the socket name\n"
msgstr "двоеточия в имени сокета недопустимы\n"
- #: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "сбой при получении списка отозванных сертификатов из '%s': %s\n"
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "сбой обработки списка отозванных сертификатов из '%s': %s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: слишком длинная строка - пропущена\n"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: обнаружен неверный отпечаток\n"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: ошибка чтения: %s\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: мусор в конце строки игнорируется\n"
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr "получен SIGHUP - повторное чтение настроек и запись буферов на диск\n"
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr "получен SIGUSR2 - действие не определено\n"
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr "получен SIGTERM - завершение работы ...\n"
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "получен SIGTERM - осталось %d активных соединений\n"
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
msgid "shutdown forced\n"
msgstr "принудительное выключение\n"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr "получен SIGINT - немедленное завершение работы\n"
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "получен сигнал %d - действие не определено\n"
@@@ -10226,76 -8074,60 +10220,76 @@@ msgstr "ответчик OCSP возв�
msgid "OCSP responder returned an too old status\n"
msgstr "ответчик OCSP возвратил слишком старый статус\n"
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "сбой assuan_inquire(%s): %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr "нет сервера LDAP"
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr "в идентификаторе сертификата нет серийного номера"
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "сбой assuan_inquire: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "сбой fetch_cert_by_url: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, c-format
msgid "error sending data: %s\n"
msgstr "ошибка отправки данных: %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "сбой start_cert_fetch: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "сбой fetch_next_cert: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "превышено max_replies %d\n"
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "сбой при выделении памяти под управляющую структуру: %s\n"
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "сбой размещения контекста Assuan: %s\n"
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "сбой инициализации сервера: %s\n"
- #: dirmngr/server.c:2632
++#: dirmngr/server.c:2738
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "сбой регистрации команд с помощью Assuan: %s\n"
- #: dirmngr/server.c:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "проблема с приемом Assuan: %s\n"
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "сбой обработки Assuan: %s\n"
@@@ -10336,7 -8160,6 +10330,7 @@@ msgstr "
"сертификат не следовало использовать для подписывания списка отозванных "
"сертификатов\n"
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
msgid "quiet"
msgstr "менее подробно"
@@@ -10427,259 -8230,194 +10421,259 @@@ msgstr "сбой отправки ст�
msgid "error sending standard options: %s\n"
msgstr "ошибка отправки стандартных параметров: %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr "Параметры, управляющие выводом диагностики"
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr "Параметры, управляющие настройками"
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr "Параметры, полезные для отладки"
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr "Параметры, управляющие безопасностью"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|сбрасывать ключи SSH по истечении N секунд"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|установить максимальный срок запоминания PIN N секунд"
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|установить максимальный срок действия ключа SSH N секунд"
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr "Параметры, обеспечивающие правила для фраз-паролей"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr "не позволять обходить правила для фраз-паролей"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|установить минимальную длину фразы-пароля равной N"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|n|требовать для новой фразы-пароля не менее N неалфавитных символов"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|FILE|проверять новую фразу-пароль по файлу образцов FILE"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
msgid "|N|expire the passphrase after N days"
msgstr "|N|считать фразу-пароль устаревшей через N дней"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
msgid "do not allow the reuse of old passphrases"
msgstr "не разрешать повторное использование старых фраз-паролей"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|установить время ожидания ввода пароля N секунд"
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|использовать NAME как основной секретный ключ"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAME|зашифровывать также для идентификатора пользователя NAME"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|установить синонимы электронной почты"
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr "Настройки серверов ключей"
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
msgid "|URL|use keyserver at URL"
msgstr "|URL|использовать север ключей по URL"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr "разрешить поиск по PKA (запросы DNS)"
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
"|MECHANISMS|использовать механизмы MECHANISMS для поиска ключей по адресу "
"электронной почты"
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr "полностью запретить доступ к dirmngr"
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAME|использовать кодировку NAME для фраз-паролей PKCS#12"
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr "не проверять списки отозванных сертификатов для корневых сертификатов"
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr "Параметры, управляющие форматом вывода"
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr "Параметры, управляющие интерактивностью и принудительными действиями"
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
msgstr "Параметры, управляющие применением Tor"
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr "Настройки серверов HTTP"
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr "использовать системные настройки промежуточного сервера HTTP"
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr "Настройки серверов LDAP"
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr "Список серверов LDAP"
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr "Настройки OCSP"
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr "OpenPGP"
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr "Закрытые ключи"
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr "Криптографические карты"
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr "S/MIME"
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
msgid "Network"
msgstr "Сеть"
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
msgid "Passphrase Entry"
msgstr "Ввод фраз-паролей"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
msgid "Component not suitable for launching"
msgstr "Компонент не подходит для запуска"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr "Внешняя проверка компонента %s не прошла"
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr "Обратите внимание, что спецификации групп игнорируются\n"
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, c-format
msgid "error closing '%s'\n"
msgstr "ошибка закрытия '%s'\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, c-format
msgid "error parsing '%s'\n"
msgstr "ошибка при интерпретации '%s'\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr "вывод списка всех компонентов"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr "проверить все программы"
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr "|COMPONENT|вывод списка параметров"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr "|COMPONENT|изменить параметры"
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr "|COMPONENT|проверить параметры"
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr "применить глобальные значения по умолчанию"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
msgstr "|FILE|обновить файлы конфигурации из файла FILE"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr "получить каталоги настроек для @GPGCONF@"
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
msgid "list global configuration file"
msgstr "указать глобальный файл настроек"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
msgid "check global configuration file"
msgstr "проверить глобальный файл настроек"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
msgid "query the software version database"
msgstr "запросить базу данных версий программ"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr "перезагрузить все или заданный компонент"
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr "запустить заданный компонент"
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr "выключить заданный компонент"
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "вывод в указанный файл"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr "задействовать изменения во время исполнения, если возможно"
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Вызов: @GPGCONF@ [параметры] (-h - подсказка)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10687,15 -8425,12 +10681,15 @@@ msgstr "
"Синтаксис: @GPGCONF@ [параметры]\n"
"Управляет параметрами настроек инструментария @GNUPG@\n"
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr "Требуется однокомпонентный аргумент"
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
msgid "Component not found"
msgstr "Компонент не найден"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
msgid "No argument allowed"
msgstr "Аргументы не разрешены"
diff --cc po/sk.po
index f74e858,cb0a41f..6e76ea4
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2004-07-20 15:52+0200\n"
"Last-Translator: Michal Majer <mmajer at econ.umb.sk>\n"
"Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@@ -158,26 -129,11 +158,26 @@@ msgstr "nesprávne heslo
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ochranný algoritmus %d%s nie je podporováný\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -382,8 -299,6 +382,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "zmeniť heslo"
- #: agent/gpg-agent.c:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -393,124 -308,92 +393,124 @@@ msgstr "
"Možnosti:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "Kľúč je nahradený"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "s dodatočnými informáciami"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "byť o trochu tichší"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 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:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 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:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "aktualizovať databázu dôvery"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, 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:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
#, fuzzy
msgid "allow presetting passphrase"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "nepodporované"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -519,169 -402,121 +519,164 @@@ msgstr "nepodporované
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "vybraný hashovací algoritmus je neplatný\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 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:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, 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:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s: nemôžem vytvoriť: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
#, 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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, 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:2241 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:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "zapisujem tajný kľúč do `%s'\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, 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:2327
++#: agent/gpg-agent.c:2351
#, 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:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "chyba pri čítaní `%s': %s\n"
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2771
++#: agent/gpg-agent.c:2795
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, 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:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: preskočené: %s\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
@@@ -697,8 -530,6 +692,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -706,9 -537,6 +701,9 @@@ msgstr "
"@Príkazy:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -762,8 -582,6 +757,8 @@@ msgstr "Zrušiť
msgid "error while asking for the passphrase: %s\n"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "chyba pri čítaní `%s': %s\n"
@@@ -947,8 -730,6 +942,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "chyba pri čítaní `%s': %s\n"
@@@ -1424,7 -1107,6 +1419,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
#, fuzzy
msgid "out of core\n"
msgstr "nespracované"
@@@ -1483,8 -1154,6 +1478,8 @@@ msgstr "verejný kľúč %08lX nebol n�
msgid "waiting for lock %s...\n"
msgstr "zapisujem tajný kľúč do `%s'\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1670,8 -1302,6 +1665,8 @@@ msgstr "tajný kľúč nie je dostupný
msgid "OpenPGP card no. %s detected\n"
msgstr ""
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "nemožno previesť v dávkovom móde\n"
@@@ -1686,10 -1314,6 +1681,10 @@@ msgstr "Tento príkaz nie je v módoch
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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Váš výber? "
@@@ -1751,17 -1362,11 +1746,17 @@@ msgstr "
msgid "URL to retrieve public key: "
msgstr "žiadny zodpovedajúci verejný kľúč: %s\n"
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, 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:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: 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"
@@@ -1818,7 -1412,6 +1813,7 @@@ msgstr "Vytvorenie kľúča sa nepodari
msgid "not an OpenPGP card"
msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, 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"
@@@ -1854,13 -1441,10 +1849,13 @@@ msgstr "Akú veľkosť kľúča si praj
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr ""
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: 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:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
@@@ -1915,9 -1489,6 +1910,9 @@@ msgstr " (%d) RSA (len na šifrovanie
msgid " (3) Authentication key\n"
msgstr ""
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Neplatný výber.\n"
@@@ -2058,22 -1599,14 +2053,22 @@@ msgstr "--output pre tento príkaz nefu
msgid "can't open '%s'\n"
msgstr "nemožno otvoriť `%s'\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "chyba pri čítaní bloku kľúča: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "kľúč `%s' nebol nájdený: %s\n"
@@@ -2168,8 -1683,6 +2163,8 @@@ 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:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, 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"
@@@ -2197,7 -1706,6 +2192,7 @@@ msgstr "vyžiadaná symetrická šifra
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s zašifrovaný pre: %s\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2324,27 -1808,21 +2319,27 @@@ msgstr "%s: preskočené: %s\n
msgid "writing to '%s'\n"
msgstr "zapisujem do '%s'\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, 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:1904
++#: g10/export.c:1909
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "zapisujem tajný kľúč do `%s'\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "VAROVANIE: nič nebolo vyexportované\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2355,13 -1832,10 +2350,13 @@@ msgstr "chyba pri vytváraní `%s': %s\
msgid "[User ID not found]"
msgstr "[User id not found]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "neplatný parameter pre import\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2371,62 -1844,51 +2366,62 @@@
msgid "error looking up: %s\n"
msgstr "chyba pri čítaní `%s': %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "chyba pri vytváraní `%s': %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "chyba pri vytváraní `%s': %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
#, fuzzy
msgid "No fingerprint"
msgstr "vypísať fingerprint"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, fuzzy, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "tajný kľúč `%s' nebol nájdený: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
# c-format
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, 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/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "neplatný parameter pre import\n"
@@@ -2640,7 -2056,6 +2635,7 @@@ msgstr "použiť kánonický textový m
msgid "|FILE|write output to FILE"
msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "nevykonať žiadne zmeny"
@@@ -3034,7 -2376,6 +3029,7 @@@ msgstr "%s:%d: neplatný parameter pre
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVANIE: program môže vytvoriť súbor core!\n"
@@@ -3053,7 -2391,6 +3048,7 @@@ msgstr "Nie je dovolené používať %
msgid "%s makes no sense with %s!\n"
msgstr "%s nedáva s %s zmysel!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr ""
@@@ -3062,7 -2398,6 +3057,7 @@@
msgid "will not run with insecure memory due to %s\n"
msgstr "zapisujem tajný kľúč do `%s'\n"
- #: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "vybraný šifrovací algoritmus je neplatný\n"
@@@ -3127,8 -2448,6 +3122,8 @@@ msgstr "neplatné užívateľské predv
msgid "%s does not yet work with %s\n"
msgstr "%s ešte nepracuje s %s\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 sm/sign.c:478 sm/verify.c:473
#, fuzzy, c-format
msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "nemôžete použiť hashovací algoritmus \"%s\" v móde %s\n"
@@@ -3262,7 -2555,6 +3257,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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|zapísať informácie o stave do tohto FD"
@@@ -4644,7 -3662,6 +4639,7 @@@ msgstr "Ste si istý, že ho chcete st�
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Nemali by ste pridávať fotografické ID k PGP2 kľúču.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr ""
@@@ -4947,54 -3903,42 +4942,54 @@@ msgstr "príliš veľa `%c' predvolieb\
msgid "too many compression preferences\n"
msgstr "príliš veľa `%c' predvolieb\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, fuzzy, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "neplatný znak v reťazci s predvoľbami\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "zapisujem podpis kľúča ním samým (direct signature)\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "zapisujem podpis kľúča sebou samým\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "zapisujem \"key-binding\" podpis\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "neplatná dĺžka kľúča; použijem %u bitov\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "dĺžka kľúča zaokrúhlená na %u bitov\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
#, fuzzy
msgid "Sign"
msgstr "sign"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr ""
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
#, fuzzy
msgid "Encrypt"
msgstr "šifrovať dáta"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr ""
@@@ -5008,157 -3952,126 +5003,157 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr ""
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr ""
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (len na šifrovanie)\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr ""
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Prosím, vyberte druh kľúča, ktorý chcete:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA a ElGamal (implicitný)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA a ElGamal (implicitný)\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (len na podpis)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (len na podpis)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (len na šifrovanie)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (len na šifrovanie)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (len na šifrovanie)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (len na šifrovanie)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA a ElGamal (implicitný)\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (len na podpis)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, fuzzy, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) RSA (len na šifrovanie)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (len na šifrovanie)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (len na šifrovanie)\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Podpisová notácia: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "zaokrúhlené na %u bitov\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Akú veľkosť kľúča si prajete? (1024) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Akú veľkosť kľúča si prajete? (1024) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Požadovaná dĺžka kľúča je %u bitov.\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Prosím, vyberte druh kľúča, ktorý chcete:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5174,7 -4087,6 +5169,7 @@@ msgstr "
" <n>m = doba platnosti kľúča skončí za n mesiacov\n"
" <n>y = doba platnosti kľúča skončí za n rokov\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5190,40 -4102,32 +5185,40 @@@ msgstr "
" <n>m = doba platnosti podpisu skončí za n mesiacov\n"
" <n>y = doba platnosti podpisu skončí za n rokov\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "Kľúč je platný na? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Podpis je platný na? (0) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "neplatná hodnota\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "platnosť %s neskončí\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "platnosť %s neskončí\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "platnosť %s skončí %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Platnosť podpisu vyprší %s\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5231,12 -4135,10 +5226,12 @@@ msgstr "
"Váš systém nevie zobraziť dátumy po roku 2038.\n"
"V každom prípade budú dátumy korektne spracovávané do roku 2106.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Je to správne (a/n)? "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5247,7 -4149,6 +5242,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
#, fuzzy
msgid ""
"\n"
@@@ -5264,50 -4165,39 +5259,50 @@@ msgstr "
" \"Jozko Mrkvicka (student) <jozko at mrkvicka.sk>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Meno a priezvisko: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Neplatný znak ve mene\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "Meno nemôže začínať číslicou\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "Meno musí byť dlhé aspoň 5 znakov\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "E-mailová adresa: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "Neplatná e-mailová adresa\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Komentár: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Neplatný znak v komentári\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Používate znakovú sadu `%s'.\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5318,7 -4208,6 +5313,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Do poľa meno alebo komentár nepíšte, prosím, e-mailovú adresu.\n"
@@@ -5333,35 -4222,28 +5328,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "mMkKeEPpUu"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Zmeniť (M)eno, (K)omentár, (E)-mail alebo (U)končiť? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Zmeniť (M)eno, (K)omentár, (E)-mail alebo (P)okračovať/(U)končiť? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Zmeniť (M)eno, (K)omentár, (E)-mail alebo (U)končiť? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Zmeniť (M)eno, (K)omentár, (E)-mail alebo (P)okračovať/(U)končiť? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Najskôr, prosím, opravte chybu\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5373,13 -4255,10 +5368,13 @@@ msgstr "
"používať disky); vďaka tomu má generátor lepšiu šancu získať dostatok "
"entropie.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvorenie kľúča sa nepodarilo: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5387,66 -4266,53 +5382,66 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' je už skomprimovaný\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "Použiť napriek tomu tento kľúč? "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
#, fuzzy
msgid "creating anyway\n"
msgstr "vytvoriť nový pár kľúčov"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Vytváranie kľúča bolo zrušené.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "nemôžem vytvoriť `%s': %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "POZNÁMKA: platnosť tajného kľúča %08lX skončila %s\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "zapisujem verejný kľúč do `%s'\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenájdený zapisovateľný súbor verejných kľúčov (pubring): %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "chyba pri zápise do súboru verejných kľúčov `%s': %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "verejný a tajný kľúč boli vytvorené a podpísané.\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5455,7 -4321,6 +5450,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:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5463,7 -4328,6 +5458,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:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5471,22 -4335,18 +5466,22 @@@ msgstr "
"kľúč bol vytvorený %lu sekund v budúcnosti (došlo k zmene času alebo\n"
"je problém so systémovým časom)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
#, 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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajné časti primárneho kľúča nie sú dostupné.\n"
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
#, 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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Skutočne vytvoriť? "
@@@ -6232,27 -4947,22 +6227,28 @@@ msgstr "\"%s\" nie je súbor JPEG\n
msgid "Is this photo correct (y/N/q)? "
msgstr "Je táto fotografia správna (a/N/u)? "
+#: g10/photoid.c:380
+ #, fuzzy
msgid "unable to display photo ID!\n"
msgstr "nemožno nastaviť exec-path na %s\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Dôvod nebol špecifikovaný"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "Kľúč je nahradený"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "Kľúč bol skompromitovaný"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "Kľúč sa už nepoužíva"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "Identifikátor užívateľa už neplatí"
@@@ -6333,7 -5030,6 +6329,7 @@@ msgid "
"\n"
msgstr ""
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Vaše rozhodnutie? "
@@@ -6481,47 -5149,38 +6477,47 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Nie je isté, že tento podpis patrí vlastníkovi.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: preskočené: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: preskočené: verejný kľúč je neplatný (disabled)\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: preskočené: verejný kľúč je už obsiahnutý v databáze\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "nemôžem sa pripojiť k `%s': %s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "neplatný hashovací algoritmus `%s'\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "neplatný hashovací algoritmus `%s'\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr ""
"Nešpecifikovali ste identifikátor užívateľa (user ID). Môžete použiť \"-r\"\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6529,37 -5188,29 +6525,37 @@@ msgstr "
"\n"
"Napíšte identifikátor užívateľa (user ID). Ukončite prázdnym riadkom: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Takýto identifikátor užívateľa neexistuje.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "preskočené: verejný kľúč je už nastavený podľa implicitného adresáta\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "Verejný kľúč je neplatný (disabled).\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "preskočené: verejný kľúč je už nastavený\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "neznámy implicitný adresát `%s'\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "žiadne platné adresy\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "kľúč %08lX: chyba identifikátor užívateľa\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "kľúč %08lX: chyba identifikátor užívateľa\n"
@@@ -6664,7 -5293,6 +6660,7 @@@ msgstr "Tajný kľúč je dostupný.\n
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "Vytvoriť pre tento podpis revokačný certifikát? "
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "Vynútený ASCII textový výstup.\n"
@@@ -6682,19 -5307,16 +6678,19 @@@ msgstr "Revokačný certifikát bol vyt
msgid "no revocation keys found for \"%s\"\n"
msgstr "žiadne revokačné kľúče pre `%s' nenájdené\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
#, fuzzy
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Vytvoriť pre tento podpis revokačný certifikát? "
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6703,20 -5325,17 +6699,20 @@@
"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:577
++#: g10/revoke.c:590
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Revokačný certifikát bol vytvorený.\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
msgid "secret key \"%s\" not found\n"
msgstr "tajný kľúč `%s' nebol nájdený: %s\n"
@@@ -6724,23 -5343,19 +6720,23 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
#, fuzzy
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Vytvoriť pre tento podpis revokačný certifikát? "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6758,33 -5373,26 +6754,33 @@@ msgstr "
"Ale hrozí nebezpečenstvo: Tlačový systém Vášho počítača môže ukladať dáta a\n"
"sprístupniť ich iným!\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Prosím výberte dôvod na revokáciu:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Zrušiť"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Pravdepodobne ste chceli vybrať %d)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Ak chcete, napíšte popis; ukončite prázdnym riadkom:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Dôvod na revokáciu: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(Žiadny popis)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
#, fuzzy
msgid "Is this okay? (y/N) "
msgstr "Je to v poriadku? "
@@@ -7198,10 -5732,6 +7194,10 @@@ msgstr "chyba pri vytváraní hesla: %s
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
@@@ -7233,7 -5758,6 +7229,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "chyba pri čítaní `%s': %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
@@@ -7545,18 -6020,14 +7541,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7621,7 -6080,6 +7617,7 @@@ msgstr "
msgid "no need for a trustdb check\n"
msgstr "nie je nutné kontrolovať databázu dôvery\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "dalšia kontrola databázy dôvery %s\n"
@@@ -7649,14 -6102,12 +7645,14 @@@ msgstr "prosím vykonajte --check-trust
msgid "checking the trustdb\n"
msgstr "kontrolujem databázu dôvery\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "%lu kľúče boli doteraz spracované\n"
msgstr[1] "%lu kľúče boli doteraz spracované\n"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7664,22 -6115,18 +7660,22 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d kľúčov spracovaných (%d počtov platnosti vymazaných)\n"
msgstr[1] "%d kľúčov spracovaných (%d počtov platnosti vymazaných)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "neboli nájdené žiadne absolútne dôveryhodné kľúče\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "verejný kľúč k absolútne dôveryhodnému kľúču %08lX nebol nájdený\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "záznam dôvery %lu, typ %d: zápis zlyhal: %s\n"
@@@ -8110,76 -6471,60 +8106,76 @@@ msgstr "zmeniť heslo
msgid "|N|Initial New PIN"
msgstr ""
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr ""
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
#, fuzzy
msgid "|NAME|use NAME as ct-API driver"
msgstr "|MENO|použiť MENO ako implicitného adresáta"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
#, fuzzy
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|MENO|použiť MENO ako implicitného adresáta"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
#, fuzzy
msgid "do not use the internal CCID driver"
msgstr "vôbec nepoužívať terminál"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr ""
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr ""
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
#, fuzzy
msgid "deny the use of admin card commands"
msgstr "konfliktné príkazy\n"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8899,7 -7091,6 +8895,7 @@@ msgstr "
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
@@@ -8961,17 -7142,14 +8957,17 @@@ msgstr " s = preskočiť tento kľúč\
msgid "could not parse keyserver\n"
msgstr "nemožno použiť URI servera kľúčov - chyba analýzy URI\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "zapisujem do '%s'\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "nemôžem zavrieť `%s': %s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9922,116 -7910,88 +9918,116 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
#, fuzzy
msgid "run without asking a user"
msgstr "Ukončiť bez uloženia? "
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
#, 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:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10045,91 -8005,72 +10041,91 @@@ msgstr "
"(Použite manuálové stránky pre kompletný zoznam všetkých príkazov a "
"možností)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "použitie: gpg [možnosti] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
#, 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:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "riadok je príliš dlhý\n"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, fuzzy, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "chyba: neplatný odtlačok\n"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, fuzzy, c-format
msgid "%s:%u: read error: %s\n"
msgstr "chyba pri čítaní: %s\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
#, fuzzy
msgid "shutdown forced\n"
msgstr "nespracované"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10573,77 -8423,61 +10569,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "zmazanie bloku kľúča sa nepodarilo: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "nemôžem vytvoriť `%s': %s\n"
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
#, 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:2632
++#: dirmngr/server.c:2738
#, 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:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10687,7 -8513,6 +10683,7 @@@ msgstr "duplicita predvoľby %c%lu\n
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
#, fuzzy
msgid "quiet"
msgstr "ukončiť"
@@@ -10780,286 -8585,218 +10776,286 @@@ 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr ""
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr ""
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|použiť mód hesla N"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "chyba pri vytváraní hesla: %s\n"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|MENO|šifrovať pre MENO"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
#, 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:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|ALG|použiť šifrovací algoritmus ALG pre heslá"
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "chyba siete"
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
msgid "Passphrase Entry"
msgstr "nesprávne heslo"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
#, fuzzy
msgid "Component not suitable for launching"
msgstr "verejný kľúč nenájdený"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "chyba pri čítaní `%s': %s\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
msgid "error parsing '%s'\n"
msgstr "chyba pri čítaní `%s': %s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
#, fuzzy
msgid "list global configuration file"
msgstr "neznáma položka konfigurácie \"%s\"\n"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
#, fuzzy
msgid "check global configuration file"
msgstr "neznáma položka konfigurácie \"%s\"\n"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "aktualizovať databázu dôvery"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "použiť ako výstupný súbor"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
#, fuzzy
msgid "Component not found"
msgstr "verejný kľúč nenájdený"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
#, fuzzy
msgid "No argument allowed"
msgstr "zapisujem tajný kľúč do `%s'\n"
diff --cc po/sv.po
index ce05b1d,d5da7ca..214ed1c
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2017-11-02 17:41+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@@ -185,26 -156,11 +185,26 @@@ msgstr "Felaktig lösenfras
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh-nycklar större än %d bitar stöds inte\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -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:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -440,147 -355,108 +440,147 @@@ msgstr "
"@Flaggor:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr "kör i demonläge (bakgrund)"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr "kör i serverläge (förgrund)"
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "run in server mode"
msgid "run in supervised mode"
msgstr "kör i serverläge"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "utförlig"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "var något tystare"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr "sh-liknande kommandoutdata"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr "csh-liknande kommandoutdata"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|FIL|läs inställningar från FIL"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr "frigör inte från konsollen"
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "använd en loggfil för servern"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PRG|använd PRG som SCdaemon-programmet"
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
msgid "do not use the SCdaemon"
msgstr "använd inte SCdaemon"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, 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:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr "ignorera begäran om att ändra TTY"
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr "ignorera begäran om att ändra X-display"
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|låt mellanlagrade PIN-koder gå ut efter N sekunder"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr "använd inte mellanlagring av PIN-kod vid signering"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, 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:231
++#: agent/gpg-agent.c:233
#, 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:234
++#: agent/gpg-agent.c:236
msgid "allow presetting passphrase"
msgstr "tillåt förinställning av lösenfras"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
#, fuzzy
#| msgid "enable ssh-agent emulation"
msgid "enable ssh support"
msgstr "aktivera ssh-agent-emulering"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
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:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
#, 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:515
++#: agent/gpg-agent.c:525
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -592,156 -468,115 +592,151 @@@ msgstr "
"Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
"Hantering av hemliga nycklar för GnuPG\n"
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, 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:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "vald sammandragsalgoritm är ogiltig\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 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:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, 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:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, c-format
msgid "can't create socket: %s\n"
msgstr "kan inte skapa uttag: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, 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:2209
++#: agent/gpg-agent.c:2232
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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
msgid "error getting nonce for the socket\n"
msgstr "fel vid hämtning av nonce för uttaget\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, 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:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, 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:2241 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
- #, c-format
- msgid "listen() failed: %s\n"
- msgstr "listen() misslyckades: %s\n"
-
- #: agent/gpg-agent.c:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, 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:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, 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:2327
++#: agent/gpg-agent.c:2351
#, 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:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, 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:2686
++#: agent/gpg-agent.c:2710
#, 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:2691
++#: agent/gpg-agent.c:2715
#, 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:2766
++#: agent/gpg-agent.c:2790
#, 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:2771
++#: agent/gpg-agent.c:2795
#, 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:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, 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:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppad\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 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"
@@@ -759,8 -592,6 +754,8 @@@ msgstr "
"Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
"Underhåll av lösenordscache\n"
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -769,9 -600,6 +764,9 @@@ msgstr "
" "
# Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -825,8 -645,6 +820,8 @@@ msgstr "avbruten\n
msgid "error while asking for the passphrase: %s\n"
msgstr "fel vid fråga efter lösenfrasen: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -1027,8 -810,6 +1022,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, c-format
msgid "error forking process: %s\n"
msgstr "fel vid grening av process: %s\n"
@@@ -1486,7 -1169,6 +1481,7 @@@ msgstr "flagga \"%.50s\" är tvetydig\n
msgid "command \"%.50s\" is ambiguous\n"
msgstr "kommandot \"%.50s\" är tvetydigt\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
msgid "out of core\n"
msgstr "slut på minne\n"
@@@ -1549,8 -1220,6 +1544,8 @@@ msgstr "låset \"%s\" gjordes inte: %s\
msgid "waiting for lock %s...\n"
msgstr "väntar på låset %s...\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s är för gammal (behöver %s, har %s)\n"
@@@ -1740,8 -1372,6 +1735,8 @@@ msgstr "OpenPGP-kort är inte tillgäng
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP-kort nr. %s identifierades\n"
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
msgid "can't do this in batch mode\n"
msgstr "kan inte göra detta i satsläge\n"
@@@ -1753,10 -1381,6 +1748,10 @@@ msgstr "Detta kommando är endast tillg
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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Vad väljer du? "
@@@ -1813,17 -1424,11 +1808,17 @@@ 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:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, 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:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
@@@ -1874,7 -1468,6 +1869,7 @@@ msgstr "nyckelåtgärden är inte möjl
msgid "not an OpenPGP card"
msgstr "inte ett OpenPGP-kort"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, c-format
msgid "error getting current key info: %s\n"
msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
@@@ -1917,13 -1504,10 +1912,13 @@@ msgstr "
"Kortet kommer nu att konfigureras om för att generera en nyckel med %u "
"bitar\n"
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: 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:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 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"
@@@ -1985,9 -1559,6 +1980,9 @@@ msgstr " (2) Krypteringsnyckel\n
msgid " (3) Authentication key\n"
msgstr " (3) Autentiseringsnyckel\n"
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Ogiltigt val.\n"
@@@ -2124,22 -1665,14 +2119,22 @@@ msgstr "--output kan inte användas fö
msgid "can't open '%s'\n"
msgstr "kan inte öppna \"%s\"\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "fel vid läsning av nyckelblock: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
#| msgid "key \"%s\" not found: %s\n"
msgid "key \"%s\" not found\n"
@@@ -2235,8 -1750,6 +2230,8 @@@ msgstr "
"VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot "
"mottagarinställningarna\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, 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"
@@@ -2268,7 -1777,6 +2263,7 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s krypterad för: \"%s\"\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2391,26 -1875,20 +2386,26 @@@ msgstr "%s: hoppade över: %s\n
msgid "writing to '%s'\n"
msgstr "skriver till \"%s\"\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "nyckeln %s: nyckelmaterial på kortet - hoppade över\n"
- #: g10/export.c:1904
++#: g10/export.c:1909
msgid "exporting secret keys not allowed\n"
msgstr "export av hemliga nycklar tillåts inte\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "VARNING: ingenting exporterat\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2420,14 -1897,11 +2415,14 @@@ msgstr "Fel när \"%s\" skapades: %s\n
msgid "[User ID not found]"
msgstr "[Användaridentiteten hittades inte]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
msgstr "argument för flaggan \"%.50s\" saknas\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2438,62 -1911,51 +2433,62 @@@
msgid "error looking up: %s\n"
msgstr "fel vid stängning av %s: %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, fuzzy, c-format
#| msgid "automatically retrieved `%s' via %s\n"
msgid "automatically retrieved '%s' via %s\n"
msgstr "hämtade \"%s\" automatiskt via %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, fuzzy, c-format
#| msgid "error retrieving `%s' via %s: %s\n"
msgid "error retrieving '%s' via %s: %s\n"
msgstr "fel vid hämtning av \"%s\" via %s: %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
msgid "No fingerprint"
msgstr "Inget fingeravtryck"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, 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/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "valid values for option '%s':\n"
@@@ -2696,7 -2112,6 +2691,7 @@@ msgstr "använd \"ursprunglig text\"-l�
msgid "|FILE|write output to FILE"
msgstr "|FIL|skriv utdata till FIL"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "gör inga ändringar"
@@@ -3113,7 -2455,6 +3108,7 @@@ 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:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
@@@ -3132,7 -2470,6 +3127,7 @@@ msgstr "%s är inte tillåten tillsamma
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:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr "VARNING: kör med falsk systemtid: "
@@@ -3141,7 -2477,6 +3136,7 @@@
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:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "den valda chifferalgoritmen är ogiltig\n"
@@@ -3212,8 -2533,6 +3207,8 @@@ msgstr "ogiltig inställning av föredr
msgid "%s does not yet work with %s\n"
msgstr "%s fungerar ännu inte med %s\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 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"
@@@ -3353,7 -2646,6 +3348,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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|skriv statusinformation till denna FD"
@@@ -4724,7 -3742,6 +4719,7 @@@ msgstr "Vill du verkligen fortfarande l
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Du kan inte lägga till ett foto-id till en nyckel av PGP 2-typ.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr "En sådan användaridentitet finns redan på denna nyckel!\n"
@@@ -5031,55 -3987,43 +5026,55 @@@ msgstr "för många sammandragsinställ
msgid "too many compression preferences\n"
msgstr "för många komprimeringsinställningar\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, fuzzy, c-format
#| msgid "invalid item `%s' in preference string\n"
msgid "invalid item '%s' in preference string\n"
msgstr "ogiltig post \"%s\" i inställningssträngen\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "skriver direkt signatur\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "skriver självsignatur\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "skriver signatur knuten till nyckeln\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"VARNING: vissa OpenPGP-program kan inte hantera en DSA-nyckel med den här "
"sammandragsstorleken\n"
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
msgid "Sign"
msgstr "Signera"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr "Certifiera"
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
msgid "Encrypt"
msgstr "Kryptera"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr "Autentisera"
@@@ -5097,159 -4041,128 +5092,159 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr "SsKkAaQq"
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Möjliga åtgärder för en %s-nyckel: "
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr "För närvarande tillåtna åtgärder: "
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Växla signeringsförmågan\n"
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Växla krypteringsförmågan\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Växla autentiseringsförmågan\n"
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Färdig\n"
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Välj vilken typ av nyckel du vill ha:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA och RSA (standard)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA och Elgamal\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (endast signering)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (endast signering)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (endast kryptering)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (endast kryptering)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (ställ in dina egna förmågor)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (ställ in dina egna förmågor)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, fuzzy, c-format
#| msgid " (%d) DSA and Elgamal\n"
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA och Elgamal\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (endast signering)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, fuzzy, c-format
#| msgid " (%d) DSA (set your own capabilities)\n"
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) DSA (ställ in dina egna förmågor)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (endast kryptering)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, fuzzy, c-format
#| msgid " (%d) Existing key\n"
msgid " (%d) Existing key\n"
msgstr " (%d) Befintlig nyckel\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
msgid "Enter the keygrip: "
msgstr "Ange nyckelhashen: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "Inte en giltig nyckelhash (förväntade 40 hexadecimala siffror)\n"
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
msgid "No key with this keygrip\n"
msgstr "Ingen nyckel med denna nyckelhash\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "avrundade uppåt till %u bitar\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s-nycklar kan vara mellan %u och %u bitar långa.\n"
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Vilken nyckelstorlek vill du använda för undernyckeln? (%u) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Vilken nyckelstorlek vill du ha? (%u) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Välj vilken typ av nyckel du vill ha:\n"
# borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5266,7 -4179,6 +5261,7 @@@ msgstr "
" <n>y = nyckeln blir ogiltig efter n år\n"
# borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5282,38 -4194,30 +5277,38 @@@ msgstr "
" <n>m = signaturen blir ogiltig efter n månader\n"
" <n>y = signaturen blir ogiltig efter n år\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Signaturen är giltig hur länge? (%s) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "ogiltigt värde\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
msgid "Key does not expire at all\n"
msgstr "Nyckeln går aldrig ut\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
msgid "Signature does not expire at all\n"
msgstr "Signaturen går aldrig ut\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, c-format
msgid "Key expires at %s\n"
msgstr "Nyckeln går ut %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, c-format
msgid "Signature expires at %s\n"
msgstr "Signaturen går ut %s\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5321,11 -4225,9 +5316,11 @@@ msgstr "
"Ditt system kan inte visa datum senare än år 2038.\n"
"Datum fram till år 2106 kommer dock att hanteras korrekt.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
msgid "Is this correct? (y/N) "
msgstr "Stämmer detta? (j/N) "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5340,7 -4242,6 +5335,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5358,50 -4259,39 +5353,50 @@@ msgstr "
" \"Gustav Vasa (Brutal kung) <gustav at trekronor.se>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Namn: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Ogiltigt tecken i namnet\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "Namnet får inte börja med en siffra\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "E-postadress: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "E-postadressen är ogiltig\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Kommentar: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Ogiltigt tecken i kommentaren\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "Du använder teckentabellen \"%s\"\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5412,7 -4302,6 +5407,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Ange inte e-postadressen som namn eller kommentar\n"
@@@ -5428,35 -4317,28 +5423,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoAa"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Rätta först felet\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
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"
@@@ -5468,13 -4350,10 +5463,13 @@@ msgstr "
"hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
"en större chans att samla ihop en tillräcklig mängd slumpmässig data.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nyckelgenereringen misslyckades: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5482,72 -4361,59 +5477,72 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "nyckeln finns redan\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
#, fuzzy
#| msgid "Use this key anyway? (y/N) "
msgid "Create anyway? (y/N) "
msgstr "Vill du använda nyckeln ändå? (j/N) "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "genererar ny nyckel\n"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Skapandet av nycklar avbröts.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, fuzzy, c-format
#| msgid "can't create backup file `%s': %s\n"
msgid "can't create backup file '%s': %s\n"
msgstr "kan inte skapa säkerhetskopian \"%s\": %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "OBSERVERA: säkerhetskopia av kortnyckeln sparades i \"%s\"\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "skriver den publika nyckeln till \"%s\"\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "den publika och den hemliga nyckeln är skapade och signerade.\n"
# Flagga.. inte kommando
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
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"
@@@ -5557,7 -4423,6 +5552,7 @@@ msgstr "
"syfte.\n"
# c-format behövs inte i singularis
- #: g10/keygen.c:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5565,7 -4430,6 +5560,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:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5573,21 -4437,17 +5568,21 @@@ msgstr "
"nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
"relaterat till tidsresande eller en felställd klocka)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
#, 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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
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:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
msgid "Really create? (y/N) "
msgstr "Verkligen skapa? (j/N) "
@@@ -6351,25 -5065,20 +6346,25 @@@ msgstr "Är detta foto korrekt (j/N/a)
msgid "unable to display photo ID!\n"
msgstr "kan inte visa foto-id!\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Ingen anledning har angivits"
# tveksam översättning. funderar på "ersatt av något bättre" men det
# känns inte heller bra. Betyder att nyckeln inte används längre, utan användaren har skapat en ny nyckel som ersätter den gamla.
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "Nyckeln är åsidosatt"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "Nyckeln har blivit komprometterad"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "Nyckeln används inte längre"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "Användaridentiteten är inte längre giltig"
@@@ -6447,7 -5143,6 +6442,7 @@@ msgstr "
"Minimum tillitsnivå för denna nyckel är: %s\n"
"\n"
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Vad väljer du? "
@@@ -6596,49 -5263,40 +6591,49 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Det är inte säkert att signaturen tillhör ägaren.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: hoppade över: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: hoppades över: den publika nyckeln är inaktiverad\n"
# överhoppad?
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: hoppades över: publik nyckel finns redan\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "kan inte ansluta till \"%s\": %s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but no valid default keys given\n"
msgstr "rad %d: ogiltig algoritm\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but option '%s' not given\n"
msgstr "rad %d: ogiltig algoritm\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Du angav ingen användaridentitet. (du kan använda \"-r\")\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr "Nuvarande mottagare:\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6646,24 -5304,19 +6641,24 @@@ msgstr "
"\n"
"Ange användaridentiteten. Avsluta med en tom rad: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Ingen sådan användaridentitet.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr ""
"hoppade över: den publika nyckeln är redan inställd som standardmottagare\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "Den publika nyckeln är inaktiverad.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "hoppade över: publik nyckel redan angiven\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "okänd standardmottagare \"%s\"\n"
@@@ -6671,16 -5324,13 +6666,16 @@@
# plural av adressee
# dvs. den som meddelandet är adresserat till.
# Åtskillnad görs mellan adressee och receiver.
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "inga giltiga adressater\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Observera: nyckeln %s har ingen %s-förmåga\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Observera: nyckeln %s har ingen inställning för %s\n"
@@@ -6795,7 -5423,6 +6790,7 @@@ msgstr "Skapa ett spärrcertifikat fö
# -do-not-force översatt med:
# genomdriv inte
# I detta fall gäller det ett revokeringscertifikat, som gnupg alltid skapar i ASCII-format för att det ska gå att skriva ut.
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "utdata med ett ascii-skal genomdrivet.\n"
@@@ -6814,20 -5438,17 +6809,20 @@@ msgstr "Spärrcertifikat skapat.\n
msgid "no revocation keys found for \"%s\"\n"
msgstr "inga spärrnycklar hittades för \"%s\"\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6836,20 -5457,17 +6831,20 @@@
"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:577
++#: g10/revoke.c:590
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Spärrcertifikat skapat.\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6858,22 -5476,18 +6853,22 @@@ msgstr "hemliga nyckeln \"%s\" hittade
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6891,33 -5505,26 +6886,33 @@@ msgstr "
"media blir oläsligt. Men se upp: Utskriftsfunktionen på\n"
"din dator kan spara data så att det blir åtkomligt för andra!\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Välj anledning till varför nyckeln spärras:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Avbryt"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Troligen vill du välja %d här)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Ange en valfri beskrivning; avsluta med en tom rad:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Anledning för spärrning: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(Ingen beskrivning angiven)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
msgid "Is this okay? (y/N) "
msgstr "Är detta OK? (j/N) "
@@@ -7344,10 -5877,6 +7339,10 @@@ msgstr "fel när temporärfil skapades
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
@@@ -7382,7 -5906,6 +7377,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "fel vid öppnandet av \"%s\": %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
@@@ -7706,19 -6180,15 +7701,19 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, 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:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7787,7 -6245,6 +7782,7 @@@ msgstr "använder tillitsmodellen %s\n
msgid "no need for a trustdb check\n"
msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n"
@@@ -7820,7 -6272,6 +7815,7 @@@ msgstr "gör en kontroll av tillitsdata
msgid "checking the trustdb\n"
msgstr "kontrollerar tillitsdatabasen\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
#| msgid "%lu keys processed so far\n"
msgid "%d key processed"
@@@ -7829,7 -6280,6 +7824,7 @@@ msgstr[0] "%lu nycklar behandlade än s
msgstr[1] "%lu nycklar behandlade än så länge\n"
# Vad är detta!?
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7837,23 -6287,19 +7832,23 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d nycklar behandlade (%d validity counts rensade)\n"
msgstr[1] "%d nycklar behandlade (%d validity counts rensade)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "publik nyckel för förbehållslöst betrodda nyckeln %s hittades inte\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
"djup: %d giltig: %3d signerad: %3d tillit: %d-, %dq, %dn, %dm, %df, %du\n"
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -8302,59 -6662,46 +8297,59 @@@ msgstr "||Knappa in din PIN-kod på lä
msgid "|N|Initial New PIN"
msgstr "|N|Initial PIN-kod"
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr "kör i multiserverläge (förgrund)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
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:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
msgid "|FILE|write a log to FILE"
msgstr "|FIL|skriv en logg till FIL"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr "|N|anslut till läsare på port N"
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NAMN|använd NAMN som ct-API-drivrutin"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NAMN|använd NAMN som PC/SC-drivrutin"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
msgid "do not use the internal CCID driver"
msgstr "använd inte den interna CCID-drivrutinen"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr "|N|koppla från kortet efter N sekunder inaktivitet"
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
#, fuzzy
#| msgid "do not use a reader's keypad"
msgid "do not use a reader's pinpad"
msgstr "använd inte läsarens knappsats"
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
msgid "deny the use of admin card commands"
msgstr "neka användning av administratörskommandon för kort"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
#, fuzzy
#| msgid ""
#| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8366,19 -6713,16 +8361,19 @@@ msgstr "
"Syntax: scdaemon [flaggor] [kommando [argument]]\n"
"Smartkortsdemon för GnuPG\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
#, fuzzy
#| msgid ""
#| "please use the option `--daemon' to run the program in the background\n"
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr "använd flaggan \"--daemon\" för att köra programmet i bakgrunden\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr "hanterare för fd %d startad\n"
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "hanterare för fd %d avslutad\n"
@@@ -9101,7 -7292,6 +9096,7 @@@ msgstr "|FIL|lägg till nyckelring til
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|ANVÄNDAR-ID|använd ANVÄNDAR-ID som förvald hemlig nyckel"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|använd denna nyckelserver för att slå upp nycklar"
@@@ -9166,19 -7346,16 +9161,19 @@@ msgstr "%s:%u: hoppar över denna rad\n
msgid "could not parse keyserver\n"
msgstr "kunde inte tolka nyckelserver\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, fuzzy, c-format
#| msgid "importing common certificates `%s'\n"
msgid "importing common certificates '%s'\n"
msgstr "importerar vanliga certifikat \"%s\"\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, 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:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr "ogiltigt kommando (det finns inget implicit kommando)\n"
@@@ -10220,128 -8207,100 +10215,128 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
#, 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:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "skicka ett kommando till dirmngr"
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr "|FIL|skriv serverlägesloggar till FIL"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "Avsluta utan att spara? (j/N) "
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
#, 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:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 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:216
++#: dirmngr/dirmngr.c:219
#, fuzzy
#| msgid "|URL|use keyserver at URL"
msgid "|URL|use OCSP responder at URL"
msgstr "|URL| använd nyckelservern på URL"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
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:258
++#: dirmngr/dirmngr.c:262
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10354,13 -8313,11 +10349,13 @@@ msgstr "
"@\n"
"(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
#, 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:394
++#: dirmngr/dirmngr.c:402
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10372,88 -8329,71 +10367,88 @@@ msgstr "
"Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
"Hantering av hemliga nycklar för GnuPG\n"
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, 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:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "användning: gpgsm [flaggor] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
#, 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:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, 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:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, 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:1626
++#: dirmngr/dirmngr.c:1639
#, 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:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "ogiltigt fingeravtryck"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, 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:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "inte tvingad"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10940,86 -8789,70 +10935,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, 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:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, 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:1333
++#: dirmngr/server.c:1427
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_cert_by_url failed: %s\n"
msgstr "val misslyckades: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, 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:1483
++#: dirmngr/server.c:1577
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "start_cert_fetch failed: %s\n"
msgstr "val misslyckades: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_next_cert failed: %s\n"
msgstr "val misslyckades: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, 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:2603
++#: dirmngr/server.c:2709
#, 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:2624
++#: dirmngr/server.c:2730
#, 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:2632
++#: dirmngr/server.c:2738
#, 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:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -11072,7 -8897,6 +11067,7 @@@ msgstr "certifikatet är korrekt\n
msgid "certificate should not have been used for CRL signing\n"
msgstr "certifikatet skulle inte använts för signering\n"
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
msgid "quiet"
msgstr "tyst"
@@@ -11174,281 -8978,216 +11169,281 @@@ 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr "Flaggor som kontrollerar diagnosutdata"
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr "Flaggor som kontrollerar konfigurationen"
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr "Flaggor användbara för felsökning"
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr "Flaggor som kontrollerar säkerheten"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|låt mellanlagrade SSH-nycklar gå ut efter N sekunder"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|ställ in maximal livstid för PIN-cache till N sekunder"
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|ställ in maximal livstid för SSH-nyckel till N sekunder"
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr "Flaggor som tvingar igenom en lösenfraspolicy"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr "tillåt inte att gå förbi lösenfraspolicyn"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|ställ in minimal nödvändig längd för nya lösenfraser till N"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|kräv minst N icke-alfabetiska tecken för en ny lösenfras"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|FIL|kontrollera nya lösenfraser mot mönster i FIL"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
msgid "|N|expire the passphrase after N days"
msgstr "|N|låt mellanlagrad lösenfras gå ut efter N dagar"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
msgid "do not allow the reuse of old passphrases"
msgstr "tillåt inte återanvändning av gamla lösenfraser"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
#, fuzzy
#| msgid "|N|set maximum PIN cache lifetime to N seconds"
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|ställ in maximal livstid för PIN-cache till N sekunder"
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAMN|kryptera även till användaridentiteten NAMN"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|ange e-postalias (ett eller flera)"
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr "Konfiguration för nyckelservrar"
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
msgid "|URL|use keyserver at URL"
msgstr "|URL| använd nyckelservern på URL"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
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:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr "inaktivera all åtkomst till dirmngr"
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
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:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr "kontrollera inte spärrlistor för rotcertifikat"
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr "Flaggor som kontrollerar formatet på utdata"
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr "Flaggor som kontrollerar interaktivitet och framtvingande"
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
#, fuzzy
#| msgid "Options controlling the security"
msgid "Options controlling the use of Tor"
msgstr "Flaggor som kontrollerar säkerheten"
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr "Konfiguration för HTTP-servrar"
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr "använd systemets HTTP-proxyinställningar"
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr "Konfiguration av LDAP-servrar som ska användas"
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr "LDAP-serverlista"
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr "Konfiguration för OCSP"
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
msgid "Network"
msgstr ""
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
#| msgid "Bad Passphrase"
msgid "Passphrase Entry"
msgstr "Felaktig lösenfras"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
#, fuzzy
#| msgid "Component not found"
msgid "Component not suitable for launching"
msgstr "Komponenten hittades inte"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr "Extern validering av komponenten %s misslyckades"
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr "Observera att gruppspecifikationer ignoreras\n"
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, 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:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error parsing '%s'\n"
msgstr "fel i \"%s\": %s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr "lista alla komponenter"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr "kontrollera alla program"
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr "|KOMPONENT|lista flaggor"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr "|KOMPONENT|ändra flaggor"
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr "|KOMPONENT|kontrollera flaggor"
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr "tillämpa globala standardvärden"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
#, fuzzy
#| msgid "|FILE|take policy information from FILE"
msgid "|FILE|update configuration files using FILE"
msgstr "|FIL|hämta policyinformation från FIL"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
#, fuzzy
#| msgid "get the configuration directories for gpgconf"
msgid "get the configuration directories for @GPGCONF@"
msgstr "hämta konfigurationskatalogerna för gpgconf"
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
msgid "list global configuration file"
msgstr "lista global konfigurationsfil"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
msgid "check global configuration file"
msgstr "kontrollera global konfigurationsfil"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "uppdatera tillitsdatabasen"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
#, fuzzy
#| msgid "list all components"
msgid "reload all or a given component"
msgstr "lista alla komponenter"
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
#, fuzzy
#| msgid "list all components"
msgid "launch a given component"
msgstr "lista alla komponenter"
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
#, fuzzy
#| msgid "list all components"
msgid "kill a given component"
msgstr "lista alla komponenter"
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "använd som fil för utdata"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr "aktivera ändringar vid körtid, om möjligt"
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
#, 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:131
++#: tools/gpgconf.c:139
#, fuzzy
#| msgid ""
#| "Syntax: gpgconf [options]\n"
@@@ -11460,15 -9199,12 +11455,15 @@@ msgstr "
"Syntax: gpgconf [flaggor]\n"
"Hantera konfigurationsinställningar för verktygen i GnuPG-systemet\n"
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr "Behöver ett komponentargument"
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
msgid "Component not found"
msgstr "Komponenten hittades inte"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
msgid "No argument allowed"
msgstr "Inget argument tillåts"
diff --cc po/tr.po
index 529c931,f5e08eb..13e45ff
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2015-02-11 19:18+0100\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun at belgeler.gen.tr>\n"
"Language-Team: Turkish\n"
@@@ -156,26 -127,11 +156,26 @@@ msgstr "Anahtar Parolası hatalı
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
+#: agent/command-ssh.c:839 common/dotlock.c:839 g10/card-util.c:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -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:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -410,145 -325,106 +410,145 @@@ msgstr "
"@Seçenekler:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr "artalan süreci olarak çalışır"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr "sunucu olarak (önalanda) çalışır"
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "run in server mode"
msgid "run in supervised mode"
msgstr "sunucu kipinde çalışır"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "ayrıntılı"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "biraz daha sessiz olur"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr "sh tarzı komut çıktısı"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr "csh tarzı komut çıktısı"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|DOSYA|seçenekler DOSYAdan okunur"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr "konsoldan kopulmaz"
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 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:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
msgid "do not use the SCdaemon"
msgstr "Akıllı kart süreci kullanılmaz"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, 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:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr "TTY değiştirme istekleri yoksayılır"
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr "X birimi değiştirme istekleri yoksayılır"
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr "imzalarken PIN arabelleği kullanılmaz"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, 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:231
++#: agent/gpg-agent.c:233
#, 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:234
++#: agent/gpg-agent.c:236
msgid "allow presetting passphrase"
msgstr "anahtar parolasının önceden atanmasına izin verilir"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
#, fuzzy
#| msgid "enable ssh-agent emulation"
msgid "enable ssh support"
msgstr "ssh-agent öykünümü etkinleşir"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
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:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
#, 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:515
++#: agent/gpg-agent.c:525
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -560,154 -436,113 +560,149 @@@ msgstr "
"Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
"GnuPG için gizli anahtar yönetimi\n"
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, 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:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "seçilen özet algoritması geçersiz\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 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:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, 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:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, c-format
msgid "can't create socket: %s\n"
msgstr "soket oluşturulamıyor: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, 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:2209
++#: agent/gpg-agent.c:2232
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:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
msgid "error getting nonce for the socket\n"
msgstr "soket için tuz alınırken hata\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, 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:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, 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:2241 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:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, fuzzy, c-format
#| msgid "listening on socket `%s'\n"
msgid "listening on socket '%s'\n"
msgstr "`%s' soketi dinlemede\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, 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:2327
++#: agent/gpg-agent.c:2351
#, 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:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
#, 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:2691
++#: agent/gpg-agent.c:2715
#, 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:2766
++#: agent/gpg-agent.c:2790
#, 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:2771
++#: agent/gpg-agent.c:2795
#, 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:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, 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:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s durdu\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "bu oturumda çalışan gpg-agent yok\n"
@@@ -724,8 -557,6 +719,8 @@@ msgstr "
"Sözdizimi: gpg-preset-passphrase [seçenekler] ANHMAŞASI\n"
"Parola arabelleği bakımcısı\n"
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -733,9 -564,6 +728,9 @@@ msgstr "
"@Komutlar:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -791,8 -611,6 +786,8 @@@ msgstr "iptal edildi\n
msgid "error while asking for the passphrase: %s\n"
msgstr "anahtar parolası sorulurken hata: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, fuzzy, c-format
#| msgid "error opening `%s': %s\n"
msgid "error opening '%s': %s\n"
@@@ -992,8 -775,6 +987,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, c-format
msgid "error forking process: %s\n"
msgstr "süreç çatallanırken hata: %s\n"
@@@ -1455,7 -1138,6 +1450,7 @@@ msgstr "\"%.50s\" seçeneği belirsiz\n
msgid "command \"%.50s\" is ambiguous\n"
msgstr "\"%.50s\" komutu belirsiz\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
msgid "out of core\n"
msgstr "nüve dışında\n"
@@@ -1518,8 -1189,6 +1513,8 @@@ msgstr "kilit `%s' yapılmadı: %s\n
msgid "waiting for lock %s...\n"
msgstr "%s kilidi için bekleniyor...\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s çok eski (gereken %s, sizinki %s)\n"
@@@ -1704,8 -1336,6 +1699,8 @@@ msgstr "OpenPGP anahtarı kullanılabil
msgid "OpenPGP card no. %s detected\n"
msgstr "%s numaralı OpenPGP kartı saptandı\n"
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
msgid "can't do this in batch mode\n"
msgstr "bu önceden betik kipinde yapılamaz\n"
@@@ -1717,10 -1345,6 +1712,10 @@@ msgstr "Bu komut sadece 2. sürüm kart
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:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Seçiminiz? "
@@@ -1777,17 -1388,11 +1772,17 @@@ msgstr "Hata: İsimler birlikte çok uz
msgid "URL to retrieve public key: "
msgstr "genel anahtarın alınacağı URL: "
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, 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:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "`%s' yazılırken hata: %s\n"
@@@ -1837,7 -1431,6 +1832,7 @@@ msgstr "anahtar işlemi mümkün değil
msgid "not an OpenPGP card"
msgstr "bir OpenPGP kartı değil"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, c-format
msgid "error getting current key info: %s\n"
msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
@@@ -1873,13 -1460,10 +1868,13 @@@ msgstr "İstediğiniz anahtar uzunluğ
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr ""
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "%u bite yuvarlandı\n"
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 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"
@@@ -1938,9 -1512,6 +1933,9 @@@ msgstr " (2) Şifreleme anahtarı\n
msgid " (3) Authentication key\n"
msgstr " (3) Kimlik kanıtlama anahtarı\n"
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Seçim geçersiz.\n"
@@@ -2073,22 -1614,14 +2068,22 @@@ msgstr "--output seçeneği bu komutla
msgid "can't open '%s'\n"
msgstr "`%s' açılamadı\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "anahtar bloğu okunurken hata: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
#| msgid "key \"%s\" not found: %s\n"
msgid "key \"%s\" not found\n"
@@@ -2184,8 -1699,6 +2179,8 @@@ msgstr "
"UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
"zorlanıyor\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, 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"
@@@ -2217,7 -1726,6 +2212,7 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s \"%s\" için şifrelendi\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2338,26 -1822,20 +2333,26 @@@ msgstr "%s: atlandı: %s\n
msgid "writing to '%s'\n"
msgstr "\"%s\"e yazıyor\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "anahtar %s: anahtar malzemesi kartta - atlandı\n"
- #: g10/export.c:1904
++#: g10/export.c:1909
msgid "exporting secret keys not allowed\n"
msgstr "gizli anahtarların ihracına izin verilmez\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, 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:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2367,14 -1844,11 +2362,14 @@@ msgstr "`%s' oluşturulurken hata: %s\n
msgid "[User ID not found]"
msgstr "[Kullanıcı kimliği yok]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2385,62 -1858,51 +2380,62 @@@
msgid "error looking up: %s\n"
msgstr "%s kapanırken hata: %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, fuzzy, c-format
#| msgid "automatically retrieved `%s' via %s\n"
msgid "automatically retrieved '%s' via %s\n"
msgstr "`%s' %s üzerinden özdevinimli olarak alındı\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, fuzzy, c-format
#| msgid "error retrieving `%s' via %s: %s\n"
msgid "error retrieving '%s' via %s: %s\n"
msgstr "`%s' %s üzerinden alınırken hata: %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
msgid "No fingerprint"
msgstr "Parmak izi yok"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "gizli anahtar \"%s\" yok: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, 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:3716
++#: g10/getkey.c:3724
#, 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/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "valid values for option '%s':\n"
@@@ -2644,7 -2060,6 +2639,7 @@@ msgstr "kurallı metin kipini kullanır
msgid "|FILE|write output to FILE"
msgstr "|DOSYA|çıktı DOSYAya yazılır"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "hiçbir değişiklik yapmaz"
@@@ -3056,7 -2398,6 +3051,7 @@@ msgstr "%s:%d: özdevinimli anahtar kon
msgid "invalid auto-key-locate list\n"
msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
@@@ -3075,7 -2413,6 +3070,7 @@@ msgstr "%s ile %s birlikte kullanılmaz
msgid "%s makes no sense with %s!\n"
msgstr "%s, %s ile etkisiz olur!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
@@@ -3084,7 -2420,6 +3079,7 @@@
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:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
@@@ -3147,8 -2468,6 +3142,8 @@@ msgstr "kişisel sıkıştırma tercihl
msgid "%s does not yet work with %s\n"
msgstr "%s, %s ile henüz çalışmıyor\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 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"
@@@ -3282,7 -2575,6 +3277,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:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|durum bilgisini bu FD'ye yazar"
@@@ -4672,7 -3690,6 +4667,7 @@@ msgstr "Onu yine de eklemek istiyor mus
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr ""
@@@ -4989,55 -3945,43 +4984,55 @@@ msgstr "çok fazla özet tercihi\n
msgid "too many compression preferences\n"
msgstr "çok fazla sıkıştırma tercihi\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, fuzzy, c-format
#| msgid "invalid item `%s' in preference string\n"
msgid "invalid item '%s' in preference string\n"
msgstr "tercih dizgesindeki '%s' öğesi geçersiz\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "doğrudan imza yazılıyor\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "öz-imza yazılıyor\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "anahtarı garantileyen imzayı yazıyor\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"UYARI: bazı OpenPGP uygulamaları bu özet boyutlu bir DSA anahtarıyla "
"çalışamayabilir\n"
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
msgid "Sign"
msgstr "İmzalama"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr "Onayla"
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
msgid "Encrypt"
msgstr "Şifrele"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr "Kimlik kanıtla"
@@@ -5051,159 -3995,128 +5046,159 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr "OoŞşKkçÇ"
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr "bir %s anahtarı için olası eylemler: "
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr "Şimdilik mümkün eylemler: "
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) İmzalama yeteneğini açar/kapar\n"
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Şifreleme yeteneğini açar/kapar\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Kimlik kanıtlama yeteneğini açar/kapar\n"
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Bitti\n"
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA ve ElGamal (öntanımlı)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA ve ElGamal (öntanımlı)\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (yalnız imzalamak için)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (sadece imzalamak için)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (yalnız şifrelemek için)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (sadece şifrelemek için)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (yeteneklerini belirtin)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (yeteneklerini belirtin)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA ve ElGamal (öntanımlı)\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (yalnız imzalamak için)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, fuzzy, c-format
#| msgid " (%d) DSA (set your own capabilities)\n"
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) DSA (yeteneklerini belirtin)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (sadece şifrelemek için)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, fuzzy, c-format
#| msgid " (%d) Existing key\n"
msgid " (%d) Existing key\n"
msgstr " (%d) Mevcut anahtar\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Simgelemi giriniz: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "%d indisli bir yardımcı anahtar yok\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "%u bite yuvarlandı\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s anahtarları %u bit ile %u bit arasında olmalı.\n"
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "İstenen anahtar uzunluğu: %u bit\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5219,7 -4132,6 +5214,7 @@@ msgstr "
" <n>m = anahtar n ay geçerli\n"
" <n>y = anahtar n yıl geçerli\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5235,38 -4147,30 +5230,38 @@@ msgstr "
" <n>m = imza n ay geçerli\n"
" <n>y = imza n yıl geçerli\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "Anahtar ne kadar geçerli olacak? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "İmza ne kadar geçerli olacak? (%s) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "değer hatalı\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
msgid "Key does not expire at all\n"
msgstr "Anahtar hep geçerli olacak\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
msgid "Signature does not expire at all\n"
msgstr "İmza hep geçerli olacak\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, c-format
msgid "Key expires at %s\n"
msgstr "Anahtarın geçerliliği %s de bitecek.\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, c-format
msgid "Signature expires at %s\n"
msgstr "İmzanın geçerliliği %s de bitecek.\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5274,11 -4178,9 +5269,11 @@@ msgstr "
"Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
"Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
msgid "Is this correct? (y/N) "
msgstr "Bu doğru mu? (e/H ya da y/N) "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5293,7 -4195,6 +5288,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5309,50 -4210,39 +5304,50 @@@ msgstr "
"\t\"Fatih Sultan Mehmed (Padisah) <padisah at ottoman.gov>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Adınız ve Soyadınız: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Ad ve soyadınızda geçersiz karakter var\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "E-posta adresiniz: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "geçerli bir E-posta adresi değil\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Önbilgi: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Önbilgi alanında geçersiz karakter var\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5363,7 -4253,6 +5358,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
@@@ -5379,37 -4268,30 +5374,37 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "AaYyEeTtKk"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr ""
"(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Lütfen önce hatayı düzeltin\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5422,13 -4304,10 +5417,13 @@@ msgstr "
"iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
"üretecine yardımcı olur. \n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5436,71 -4315,58 +5431,71 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "anahtar zaten mevcut\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
#, fuzzy
#| msgid "Use this key anyway? (y/N) "
msgid "Create anyway? (y/N) "
msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "yeni anahtar üretiliyor\n"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Anahtar üretimi durduruldu.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, fuzzy, c-format
#| msgid "can't create backup file `%s': %s\n"
msgid "can't create backup file '%s': %s\n"
msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "genel anahtarı `%s'e yazıyor\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "`%s' genel anahtarlığa yazılırken hata oluştu: %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5508,14 -4374,12 +5503,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:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, 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:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5523,22 -4387,18 +5518,22 @@@ msgstr "
"anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
"problemi)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
#, 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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
msgid "Secret parts of primary key are not available.\n"
msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
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:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
msgid "Really create? (y/N) "
msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
@@@ -6295,23 -5009,18 +6290,23 @@@ msgstr "Bu foto doğru mu? (e/H/ç vey
msgid "unable to display photo ID!\n"
msgstr "foto kimliği gösterilemiyor!\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Belirtilmiş bir neden yok"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "Anahtarın yerine başkası konulmuş ve iptal edilmiştir"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "Anahtar tehlikede"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "Anahtar artık kullanılmayacak"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "Kullanıcı kimliği artık geçersiz"
@@@ -6388,7 -5084,6 +6383,7 @@@ msgstr "
"Bu anahtar için asgari güvence seviyesi: %s\n"
"\n"
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Kararınız? "
@@@ -6542,48 -5209,39 +6537,48 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Bu imzanın sahibine ait olduğu kesin değil.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: atlandı: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: atlandı: genel anahtar iptal edildi\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: atlandı: genel anahtar zaten var\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but no valid default keys given\n"
msgstr "`%d. satır: algoritma geçersiz\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
#| msgid "line %d: invalid algorithm\n"
msgid "option '%s' given, but option '%s' not given\n"
msgstr "`%d. satır: algoritma geçersiz\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Bir kullanıcı kimliği belirtmediniz. (\"-r\" kullanabilirsiniz)\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr "Şimdiki alıcılar:\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6591,37 -5249,29 +6586,37 @@@ msgstr "
"\n"
"Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Böyle bir kullanıcı kimliği yok.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "atlandı: genel anahtar zaten öntanımlı alıcı olarak ayarlanmış\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "Genel anahtar iptal edildi.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "öntanımlı alıcı \"%s\" bilinmiyor\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "geçerli adresler yok\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Bilginize: anahtar %s %s özelliğine sahip değil\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Bilginize: anahtar %s %s için bir tercihe sahip değil\n"
@@@ -6729,7 -5357,6 +6724,7 @@@ msgstr "
"Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H ya "
"da y/N) "
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "ASCII zırhlı çıktı istendi.\n"
@@@ -6747,7 -5371,6 +6742,7 @@@ msgstr "Yürürlükten kaldırma sertif
msgid "no revocation keys found for \"%s\"\n"
msgstr "\"%s\" için yürürlükten kaldırma anahtarları yok\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
@@@ -6755,14 -5378,12 +6750,14 @@@ msgstr "
"Bu anahtar için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H "
"ya da y/N) "
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6771,20 -5392,17 +6766,20 @@@
"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:577
++#: g10/revoke.c:590
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "Yürürlükten kaldırma sertifikası üretildi.\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6793,24 -5411,20 +6788,24 @@@ msgstr "gizli anahtar \"%s\" yok: %s\n
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
msgid "Create a revocation certificate for this key? (y/N) "
msgstr ""
"Bu anahtar için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H "
"ya da y/N) "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6828,34 -5442,27 +6823,34 @@@ msgstr "
"Sertifika kısa olacağından isterseniz, bir yazıcı çıktısı olarak alıp\n"
"bir kasada da muhafaza edebilirsiniz.\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "İptal"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr ""
"İsteğe bağlı açıklamayı girebilirsiniz; Boş bir satır işlemi sonlandırır:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Yürürlükten kaldırma sebebi: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(açıklama verilmedi)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
msgid "Is this okay? (y/N) "
msgstr "Bu tamam mı? (e/H ya da y/N) "
@@@ -7272,10 -5805,6 +7267,10 @@@ msgstr "geçici dosya oluşturulurken h
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error reading TOFU database: %s\n"
@@@ -7310,7 -5834,6 +7305,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "'%s' açılırken hata: %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
#| msgid "error sending %s command: %s\n"
msgid "error updating TOFU database: %s\n"
@@@ -7634,19 -6108,15 +7629,19 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, 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:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7712,7 -6170,6 +7707,7 @@@ msgstr "%s güvence modeli kullanılıy
msgid "no need for a trustdb check\n"
msgstr "bir güvence veritabanı denetimi gereksiz\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "sonraki güvence veritabanı denetimi %s de\n"
@@@ -7742,7 -6194,6 +7737,7 @@@ msgstr "lütfen bir --check-trustdb yap
msgid "checking the trustdb\n"
msgstr "güvence veritabanı denetleniyor\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
#| msgid "%lu keys processed so far\n"
msgid "%d key processed"
@@@ -7750,7 -6201,6 +7745,7 @@@ msgid_plural "%d keys processed
msgstr[0] "şu ana kadar %lu anahtar işlendi\n"
msgstr[1] "şu ana kadar %lu anahtar işlendi\n"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7758,16 -6208,13 +7753,16 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d anahtar işlendi (%d doğrulama temizlendi)\n"
msgstr[1] "%d anahtar işlendi (%d doğrulama temizlendi)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "son derece güvenli bir anahtar yok\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "son derece güvenli %s için genel anahtar yok\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7775,7 -6222,6 +7770,7 @@@ msgstr "
"derinlik: %d geçerli: %3d imzalı: %3d güvenilir: %d-, %dq, %dn, %dm, %df, "
"%du\n"
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -8212,60 -6572,47 +8207,60 @@@ msgstr "||Lütfen PIN'inizi okuyucunun
msgid "|N|Initial New PIN"
msgstr "|N|İlk Yeni PIN"
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr "çoklu sunucu kipinde çalışır (önalanda)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
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:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
msgid "|FILE|write a log to FILE"
msgstr "|DOSYA|DOSYAya bir günce yazar"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr "|N|N. porttaki okuyucuya bağlanır"
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
msgid "|NAME|use NAME as ct-API driver"
msgstr "|İSİM|ct-API sürücüsü olarak İSİM kullanılır"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|İSİM|PC/SC sürücüsü olarak İSİM kullanılır"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
msgid "do not use the internal CCID driver"
msgstr "dahili CCID sürücüsü kullanılmaz"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr "|N|N saniyelik durgunluktan sonra kartı ayırır"
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
#, fuzzy
#| msgid "do not use a reader's keypad"
msgid "do not use a reader's pinpad"
msgstr "bir okuyucu tuştakımı kullanılmaz"
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
#, fuzzy
msgid "deny the use of admin card commands"
msgstr "yönetici kartı komutları kullanımına izin verir"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
#, fuzzy
#| msgid ""
#| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8277,7 -6624,6 +8272,7 @@@ msgstr "
"Sözdizimi: scdaemon [seçenekler] [komut [arg ...]]\n"
"GnuPG için akıllı kart artalan süreci\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
#, fuzzy
#| msgid ""
#| "please use the option `--daemon' to run the program in the background\n"
@@@ -8286,12 -6632,10 +8281,12 @@@ msgstr "
"Programı artalanda çalışır bırakmak için lütfen `--daemon' seçeneğini "
"kullanın\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr "fd %d için eylemci başlatıldı\n"
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "fd %d için eylemci sonlandı\n"
@@@ -9014,7 -7205,6 +9009,7 @@@ msgstr "
"|KULLANICI-KİMLİĞİ|öntanımlı gizli anahtar olarak KULLANICI-KİMLİĞİ "
"kullanılır"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|BELİRTİM|anahtarları aramak için bu anahtar sunucusu kullanılır"
@@@ -9078,19 -7258,16 +9073,19 @@@ msgstr "%s:%u: bu satır atlanıyor\n
msgid "could not parse keyserver\n"
msgstr "anahtar sunucusu çözümlenemedi\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, 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:1725
++#: sm/gpgsm.c:1726
#, 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:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr "geçersiz komut (hiç dolaylı komut yok)\n"
@@@ -10128,126 -8115,98 +10123,126 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
#, 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:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
#, fuzzy
#| msgid "pass a command to the dirmngr"
msgid "shutdown the dirmngr"
msgstr "dirmngr'a bir komut aktarır"
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
#, 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:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
#, fuzzy
#| msgid "allow PKA lookups (DNS requests)"
msgid "allow sending OCSP requests"
msgstr "PKA aramalarına izin verilir (DNS istekleri)"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
#, fuzzy
#| msgid "|FILE|read options from FILE"
msgid "|FILE|read LDAP server list from FILE"
msgstr "|DOSYA|seçenekler DOSYAdan okunur"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 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:216
++#: dirmngr/dirmngr.c:219
#, 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:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -10260,13 -8219,11 +10255,13 @@@ msgstr "
"@\n"
"(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
#, 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:394
++#: dirmngr/dirmngr.c:402
#, fuzzy
#| msgid ""
#| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10278,88 -8235,71 +10273,88 @@@ msgstr "
"Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
"GnuPG için gizli anahtar yönetimi\n"
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, 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:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
msgstr "kullanımı: gpgsm [seçenekler] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
#, 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:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, 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:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, 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:1626
++#: dirmngr/dirmngr.c:1639
#, 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:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "parmakizi geçersiz"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, 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:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "zorlanmadı"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10844,86 -8693,70 +10839,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, 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:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, 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:1333
++#: dirmngr/server.c:1427
#, 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:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, 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:1483
++#: dirmngr/server.c:1577
#, 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:1516
++#: dirmngr/server.c:1610
#, 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:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, 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:2603
++#: dirmngr/server.c:2709
#, 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:2624
++#: dirmngr/server.c:2730
#, 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:2632
++#: dirmngr/server.c:2738
#, 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:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10975,7 -8800,6 +10970,7 @@@ msgstr "sertifika iyi durumda\n
msgid "certificate should not have been used for CRL signing\n"
msgstr "sertifika imzalama için kullanılmamalıydı\n"
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
msgid "quiet"
msgstr "sessiz"
@@@ -11077,284 -8881,219 +11072,284 @@@ 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:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr "Tanı çıktısını denetleyen seçenekler"
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr "Yapılandırmayı denetleyen seçenekler"
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr "Hata ayıklamaya elverişli seçenekler"
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr "Güvenliği denetleyen seçenekler"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|SSH anahtarları N saniyede zamanaşımına uğrar"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|azami PIN önbelleği ömrü N saniyeye ayarlanır"
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|azami SSH anahtarı ömrü N saniyeye ayarlanır"
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr "Bir anahtar parolası kuralını zorlayan seçenekler"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr "anahtar parolası kuralının atlanmasına izin verilmez"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|yeni anahtar parolası için gereken en küçük uzunluk N'ye ayarlanır"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
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:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|DOSYA|yeni anahtar parolası DOSYAdaki kalıba göre sınanır"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
msgid "|N|expire the passphrase after N days"
msgstr "|N|anahtar parolası N gün sonra zaman aşımına uğrar"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
msgid "do not allow the reuse of old passphrases"
msgstr "eski anahtar parolalarının yeniden kullanılmasına izin vermez"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
#, fuzzy
#| msgid "|N|set maximum PIN cache lifetime to N seconds"
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|azami PIN önbelleği ömrü N saniyeye ayarlanır"
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
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:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
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:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr "|BELİRTİM|eposta rumuzlarını ayarlar"
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr "Anahtar sunucular için yapılandırma"
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
msgid "|URL|use keyserver at URL"
msgstr "|URL| URL'si veriler anahtar sunucusu kullanılır"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr "PKA aramalarına izin verilir (DNS istekleri)"
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
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:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr "dirmngr'a tüm erişim iptal edilir"
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
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:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr "kök sertifikalar için CRLler sınanmaz"
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr "Çıktı biçimini denetleyen seçenekler"
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr "Etkileşimliliği ve zorlamayı denetleyen seçenekler"
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
#, fuzzy
#| msgid "Options controlling the security"
msgid "Options controlling the use of Tor"
msgstr "Güvenliği denetleyen seçenekler"
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr "HTTP sunucuları için yapılandırma"
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr "sistemin HTTP vekil ayarları kullanılır"
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr "Kullanılacak LDAP sunucularının yapılandırması"
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr "LDAP sunucu listesi"
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr "OCSP için yapılandırma"
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
msgid "Network"
msgstr ""
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
#| msgid "Bad Passphrase"
msgid "Passphrase Entry"
msgstr "Anahtar Parolası hatalı"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
#, fuzzy
#| msgid "Component not found"
msgid "Component not suitable for launching"
msgstr "Bileşen yok"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, 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:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr "Grup belirtimlerinin yoksayıldığına dikkat edin\n"
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, 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:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error parsing '%s'\n"
msgstr "'%s' de hata: %s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr "tüm bileşenleri listeler"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr "tüm programları sınar"
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr "|BİLEŞEN|seçenekleri listeler"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr "|BİLEŞEN|seçenekleri değiştirir"
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr "|BİLEŞEN|seçenekleri sınar"
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr "öntanımlı küresel değerleri uygular"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
#, fuzzy
#| msgid "|FILE|take policy information from FILE"
msgid "|FILE|update configuration files using FILE"
msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
#, fuzzy
#| msgid "get the configuration directories for gpgconf"
msgid "get the configuration directories for @GPGCONF@"
msgstr "gpgconf için yapılandırma dizinlerini getirir"
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
msgid "list global configuration file"
msgstr "küresel yapılandırma dosyasını listeler"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
msgid "check global configuration file"
msgstr "küresel yapılandırma dosayasını sınar"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "güvence veritabanını günceller"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
#, fuzzy
#| msgid "list all components"
msgid "reload all or a given component"
msgstr "tüm bileşenleri listeler"
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
#, fuzzy
#| msgid "list all components"
msgid "launch a given component"
msgstr "tüm bileşenleri listeler"
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
#, fuzzy
#| msgid "list all components"
msgid "kill a given component"
msgstr "tüm bileşenleri listeler"
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "çıktı dosyası olarak kullanılır"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
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:128
++#: tools/gpgconf.c:136
#, 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:131
++#: tools/gpgconf.c:139
#, fuzzy
#| msgid ""
#| "Syntax: gpgconf [options]\n"
@@@ -11366,15 -9105,12 +11361,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:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr "Tek bileşenlik değiştirge gerekli"
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
msgid "Component not found"
msgstr "Bileşen yok"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
msgid "No argument allowed"
msgstr "Değiştirgeye izin verilmez"
diff --cc po/uk.po
index 900712b,2881bb2..a9d3747
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2017-11-02 17:41+0100\n"
"Last-Translator: Yuri Chornoivan <yurchor at ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk at kde.org>\n"
@@@ -156,25 -127,10 +156,25 @@@ 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:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, c-format
msgid "can't open '%s': %s\n"
msgstr "не вдалося відкрити «%s»: %s\n"
@@@ -376,8 -293,6 +376,8 @@@ msgstr "Вкажіть пароль д�
msgid "Please enter the new passphrase"
msgstr "Вкажіть новий пароль"
- #: agent/gpg-agent.c:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -385,132 -300,93 +385,132 @@@ msgstr "
"@Параметри:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr "запустити у режимі фонової служби (фоновий)"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr "запустити у режимі сервера (основному)"
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
msgid "run in supervised mode"
msgstr "запустити у режимі із наглядом"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "докладний режим"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "дещо зменшити кількість повідомлень"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr "виведення команд у форматі sh"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr "виведення команд у форматі csh"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|FILE|прочитати параметри з вказаного файла"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr "не від’єднувати від консолі"
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "використовувати файл журналу для сервера"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|використовувати вказану програму пінзаписів"
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|використовувати вказану програму SCdaemon"
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
msgid "do not use the SCdaemon"
msgstr "не використовувати SCdaemon"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
msgid "|NAME|accept some commands via NAME"
msgstr "|NAME|приймати певні команди через NAME"
- #: agent/gpg-agent.c:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr "ігнорувати запити щодо зміни TTY"
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr "ігнорувати запити щодо зміни графічного дисплея"
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|вважати кешовані пінкоди за вказану кількість секунд"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr "не використовувати кеш пін-кодів для підписування"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
msgid "disallow the use of an external password cache"
msgstr "заборонити використання зовнішнього кешу паролів"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr "заборонити клієнтам позначати ключі як надійні"
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
msgid "allow presetting passphrase"
msgstr "дозволити попереднє встановлення пароля"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr "заборонити функції виклику перевизначати pinentry"
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr "дозволити запит пароля з Emacs"
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
msgid "enable ssh support"
msgstr "увімкнути підтримку ssh"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
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:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Будь ласка, надсилайте повідомлення про помилки на <@EMAIL@>.\n"
- #: agent/gpg-agent.c:513
++#: agent/gpg-agent.c:523
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "Використання: @GPG_AGENT@ [параметри] (-h — довідка)"
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -518,142 -394,101 +518,137 @@@ msgstr "
"Синтаксис: @GPG_AGENT@ [параметри] [команда [аргументи]]\n"
"Керування закритими ключами у @GNUPG@\n"
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "вказано некоректне значення рівня діагностики «%s»\n"
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "вибраний алгоритм побудови контрольних сум є некоректним\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "ЗАУВАЖЕННЯ: не виявлено файла типових параметрів «%s»\n"
- #: agent/gpg-agent.c:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "файл параметрів «%s»: %s\n"
- #: agent/gpg-agent.c:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, c-format
msgid "reading options from '%s'\n"
msgstr "прочитати параметри з «%s»\n"
- #: agent/gpg-agent.c:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
- #: agent/gpg-agent.c:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, c-format
msgid "can't create socket: %s\n"
msgstr "не вдалося створити сокет: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "назва сокета «%s» є надто довгою\n"
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent вже запущено, потреби у запуску нової копії немає\n"
- #: agent/gpg-agent.c:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
msgid "error getting nonce for the socket\n"
msgstr "помилка під час спроби отримання поточного стану сокета\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "помилка під час спроби прив’язування сокета до «%s»: %s\n"
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "не вдалося встановити права доступу до «%s»: %s\n"
- #: agent/gpg-agent.c:2241 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
- #, c-format
- msgid "listen() failed: %s\n"
- msgstr "помилка listen(): %s\n"
-
- #: agent/gpg-agent.c:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, c-format
msgid "listening on socket '%s'\n"
msgstr "очікування даних на сокеті «%s»\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "помилка stat() щодо «%s»: %s\n"
- #: agent/gpg-agent.c:2327
++#: agent/gpg-agent.c:2351
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "не можна використовувати як домашній каталог «%s»\n"
- #: agent/gpg-agent.c:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr ""
"помилка під час спроби читання поточного стану на файловому дескрипторі %d: "
"%s\n"
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "запущено обробки 0x%lx для файлового дескриптора %d\n"
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "обробник 0x%lx дескриптора файла %d завершив роботу\n"
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "запущено обробник ssh 0x%lx для дескриптора файла %d\n"
- #: agent/gpg-agent.c:2771
++#: agent/gpg-agent.c:2795
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "обробник ssh 0x%lx дескриптора файла %d завершив роботу\n"
- #: agent/gpg-agent.c:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "помилка pth_select: %s — очікування у 1 с\n"
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s зупинено\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "у цьому сеансі не запущено gpg-agent\n"
@@@ -670,8 -503,6 +665,8 @@@ msgstr "
"Синтаксис: gpg-preset-passphrase [параметри] KEYGRIP\n"
"Керування кешем паролів\n"
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -679,9 -510,6 +674,9 @@@ msgstr "
"@Команди:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -735,8 -555,6 +730,8 @@@ msgstr "скасовано\n
msgid "error while asking for the passphrase: %s\n"
msgstr "помилка під час спроби запиту пароля: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, c-format
msgid "error opening '%s': %s\n"
msgstr "помилка під час відкриття «%s»: %s\n"
@@@ -926,8 -709,6 +921,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, c-format
msgid "error forking process: %s\n"
msgstr "помилка під час спроби розгалужування процесу: %s\n"
@@@ -1365,7 -1048,6 +1360,7 @@@ msgstr "параметр «%.50s» є �
msgid "command \"%.50s\" is ambiguous\n"
msgstr "команда «%.50s» є неоднозначною\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
msgid "out of core\n"
msgstr "вихід за межі області пам’яті\n"
@@@ -1423,8 -1094,6 +1418,8 @@@ msgstr "блокування «%s» н�
msgid "waiting for lock %s...\n"
msgstr "очікування на блокування %s…\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s є занадто застарілою (потрібно %s, маємо %s)\n"
@@@ -1596,8 -1228,6 +1591,8 @@@ msgstr "Не вдалося отрим�
msgid "OpenPGP card no. %s detected\n"
msgstr "Виявлено картку OpenPGP з номером %s\n"
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
msgid "can't do this in batch mode\n"
msgstr "це не можна робити у пакетному режимі\n"
@@@ -1609,10 -1237,6 +1604,10 @@@ msgstr "Цією командою мо�
msgid "Reset Code not or not anymore available\n"
msgstr "Немає коду скидання або код скидання вже недоступний\n"
+#: g10/card-util.c:142 g10/card-util.c:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "Ваш вибір? "
@@@ -1670,16 -1281,10 +1665,16 @@@ msgstr "Помилка: складен�
msgid "URL to retrieve public key: "
msgstr "Адреса для отримання відкритого ключа: "
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, c-format
msgid "error reading '%s': %s\n"
msgstr "помилка під час спроби читання «%s»: %s\n"
- #: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "помилка під час спроби читання «%s»: %s\n"
@@@ -1729,7 -1323,6 +1724,7 @@@ msgstr "дія над ключем не
msgid "not an OpenPGP card"
msgstr "не є карткою OpenPGP"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, c-format
msgid "error getting current key info: %s\n"
msgstr "помилка під час отримання даних поточного ключа: %s\n"
@@@ -1771,13 -1358,10 +1766,13 @@@ msgid "The card will now be re-configur
msgstr ""
"Зараз налаштування картки буде змінено для створення %u-бітового ключа\n"
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "округлено до %u бітів\n"
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "Розміри ключів %s мають перебувати у діапазоні %u—%u\n"
@@@ -1832,9 -1406,6 +1827,9 @@@ msgstr " (2) Ключ шифрува�
msgid " (3) Authentication key\n"
msgstr " (3) Ключ розпізнавання\n"
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "Некоректний вибір.\n"
@@@ -1963,22 -1504,14 +1958,22 @@@ msgstr "--output не працює з �
msgid "can't open '%s'\n"
msgstr "не вдалося відкрити «%s»\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "помилка під час спроби читання блокування ключа: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, c-format
msgid "key \"%s\" not found\n"
msgstr "ключ «%s» не знайдено\n"
@@@ -2068,8 -1583,6 +2063,8 @@@ msgstr "
"УВАГА: примусове використання симетричного шифру %s (%d) не відповідає "
"параметрам отримувача\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, 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"
@@@ -2102,7 -1611,6 +2097,7 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s зашифровано для «%s»\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2220,26 -1704,20 +2215,26 @@@ msgstr " - пропущено
msgid "writing to '%s'\n"
msgstr "записуємо до «%s»\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "ключ %s: матеріал ключа на карті — пропущено\n"
- #: g10/export.c:1904
++#: g10/export.c:1909
msgid "exporting secret keys not allowed\n"
msgstr "експортування закритих ключів заборонено\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "ключ %s: ключ у стилі PGP 2.x — пропущено\n"
- #: g10/export.c:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "УВАГА: нічого не експортовано\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2248,13 -1725,10 +2243,13 @@@
msgid "[User ID not found]"
msgstr "[Ідентифікатор не знайдено]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(перевірте аргумент параметра «%s»)\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2265,58 -1738,47 +2260,58 @@@
msgid "error looking up: %s\n"
msgstr "помилка під час пошуку: %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, c-format
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "Попередження: запис %s наявний у сховищі %d разів\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "автоматично отримано «%s» за допомогою %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "помилка під час спроби отримання «%s» за допомогою %s: %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
msgid "No fingerprint"
msgstr "Без відбитка"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "закритий ключ «%s» не знайдено: %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, c-format
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "Попередження: «%s» не використовується як типовий ключ: %s\n"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, c-format
msgid "using \"%s\" as default secret key for signing\n"
msgstr "використовуємо «%s» як типовий закритий ключ для підписування\n"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr "усі значення, передані «%s», проігноровано\n"
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Некоректний ключ %s визнано чинним через параметр --allow-non-selfsigned-"
"uid\n"
- #: g10/getkey.c:3716
++#: g10/getkey.c:3724
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "використовуємо підключ %s замість основного ключа %s\n"
- #: g10/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, c-format
msgid "valid values for option '%s':\n"
msgstr "коректні значення параметра «%s»:\n"
@@@ -2507,7 -1923,6 +2502,7 @@@ msgstr "використовувати
msgid "|FILE|write output to FILE"
msgstr "|FILE|записати дані до вказаного файла"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "не вносити змін"
@@@ -2888,7 -2230,6 +2883,7 @@@ msgstr "%s:%d: некоректний �
msgid "invalid auto-key-locate list\n"
msgstr "некоректний список auto-key-locate\n"
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "УВАГА: можливе створення дампу пам’яті програми!\n"
@@@ -2907,7 -2245,6 +2902,7 @@@ msgstr "%s не можна викори
msgid "%s makes no sense with %s!\n"
msgstr "%s є зайвим, якщо використано %s!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr "УВАГА: запущено з фіктивним системним часом: "
@@@ -2916,7 -2252,6 +2911,7 @@@
msgid "will not run with insecure memory due to %s\n"
msgstr "не буде запущено з помилками у захисті пам’яті через %s\n"
- #: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "вибраний алгоритм шифрування є некоректним\n"
@@@ -2980,8 -2301,6 +2975,8 @@@ msgstr "некоректні особи
msgid "%s does not yet work with %s\n"
msgstr "%s ще не може працювати разом з %s\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 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"
@@@ -3121,7 -2414,6 +3116,7 @@@ msgstr "|FILE|визначити клю
msgid "make timestamp conflicts only a warning"
msgstr "супроводжувати конфлікти часових позначок лише попередженнями"
- #: g10/gpgv.c:84 sm/gpgsm.c:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|записувати до дескриптора файла дані щодо стану"
@@@ -4445,7 -3463,6 +4440,7 @@@ msgstr "Ви справді бажає�
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Не можна додавати фотоідентифікатор до ключа у форматі PGP2.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr "У цьому ключі вже існує такий ідентифікатор користувача!\n"
@@@ -4744,54 -3700,42 +4739,54 @@@ msgstr "занадто багато з�
msgid "too many compression preferences\n"
msgstr "занадто багато записів переваг стискання\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "некоректний запис «%s» у рядку переваг\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "записування безпосереднього підпису\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "записування самопідпису\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "записування підпису прив’язування ключа\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "некоректний розмір ключа; використовуємо %u-бітовий\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "розмір ключа округлено до %u-бітового\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"УВАГА: деякі з програм OpenPGP не можуть працювати з ключем DSA з таким "
"розміром контрольної суми\n"
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
msgid "Sign"
msgstr "Підписати"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr "Сертифікувати"
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
msgid "Encrypt"
msgstr "Зашифрувати"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr "Пройти розпізнавання"
@@@ -4805,151 -3749,120 +4800,151 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Можливі дії з ключем %s: "
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr "Поточні дозволені дії: "
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) увімкнути або вимкнути можливість підписування\n"
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) увімкнути або вимкнути можливість шифрування\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
" (%c) увімкнути або вимкнути можливість використання для розпізнавання\n"
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) вийти\n"
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "Вкажіть потрібний вам тип ключа:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA і RSA (типовий)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA і Elgamal\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (лише підписування)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (лише підписування)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (лише шифрування)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (лише шифрування)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (із визначенням можливостей власноруч)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (із визначенням можливостей власноруч)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) ECC та ECC\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, c-format
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) ECC (лише підписування)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) ECC (із визначенням можливостей власноруч)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, c-format
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) ECC (лише шифрування)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) Вже записаний ключ\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
msgid "Enter the keygrip: "
msgstr "Вкажіть keygrip: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "Некоректний keygrip (мало бути вказано 40 шістнадцяткових цифр)\n"
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
msgid "No key with this keygrip\n"
msgstr "Немає ключів з таким значенням keygrip\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, c-format
msgid "rounded to %u bits\n"
msgstr "округлено до %u бітів\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "ключі %s можуть мати довжину від %u до %u бітів.\n"
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "Якою має бути довжина підключа? (%u) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Якою має бути довжина ключа? (%u) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Запитана довжина ключа — %u бітів\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
msgid "Please select which elliptic curve you want:\n"
msgstr "Вкажіть потрібну вам еліптичну криву:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -4965,7 -3878,6 +4960,7 @@@ msgstr "
" <n>m = строк чинності у n місяців\n"
" <n>y = строк чинності у n років\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -4981,38 -3893,30 +4976,38 @@@ msgstr "
" <n>m = строк чинності підпису у n місяців\n"
" <n>y = строк чинності підпису у n років\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "Яким є строк чинності ключа? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Яким є строк чинності підпису? (%s) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "некоректне значення\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
msgid "Key does not expire at all\n"
msgstr "Ключ не має обмеження строку дії\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
msgid "Signature does not expire at all\n"
msgstr "Підпис не має обмеження строку дії\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, c-format
msgid "Key expires at %s\n"
msgstr "Ключ діє до %s\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, c-format
msgid "Signature expires at %s\n"
msgstr "Підпис діє до %s\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5020,11 -3924,9 +5015,11 @@@ msgstr "
"У вашій системі неможливий показ дат після 2038 року.\n"
"Але програма коректно оброблятиме ці дати до 2106 року.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
msgid "Is this correct? (y/N) "
msgstr "Все правильно? (y/N або т/Н) "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5039,7 -3941,6 +5034,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5056,49 -3957,38 +5051,49 @@@ msgstr "
" \"Ivan Ivanenko (farmer) <iivanenko at moyahata.ua>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "Справжнє ім’я: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "Некоректний символ у імені\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr "Не можна використовувати символи «%s» і «%s» у назві\n"
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "Ім’я не може починатися з цифри\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "Ім’я має бути не коротшим за 5 літер\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "Адреса ел. пошти: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "Некоректна адреса електронної пошти\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "Коментар: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "Некоректний символ у коментарі\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "Вами використано таблицю символів «%s».\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5109,7 -3999,6 +5104,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Будь ласка, не використовуйте адресу електронної пошти у полях справжнього "
@@@ -5126,32 -4015,25 +5121,32 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Змінити назву (N), коментар (C), ел. пошту (E) або вийти (Q)? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Змінити назву (N), коментар (C), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "Змінити назву (N), ел. пошту (E) або вийти (Q)? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "Змінити назву (N), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "Спочатку виправте помилку\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
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"
@@@ -5163,13 -4045,10 +5158,13 @@@ msgstr "
"під час створення простого числа. Це надасть змогу генератору\n"
"псевдовипадкових чисел створити краще випадкове число.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Помилка під час спроби створення ключа: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5180,64 -4059,51 +5175,64 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr "Продовжити? (Y (так)/n (ні)) "
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Ключ для «%s» вже існує\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
msgid "Create anyway? (y/N) "
msgstr "Створити попри це? (y (так)/N (ні)) "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
msgid "creating anyway\n"
msgstr "створюємо попри усе\n"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
"Зауваження: скористайтеся «%s %s», щоб викликати повноцінне діалогове вікно "
"створення ключа.\n"
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "Створення ключа скасовано.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "не вдалося створити файл резервної копії «%s»: %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "ЗАУВАЖЕННЯ: резервну копію ключа на картці збережено до «%s»\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, c-format
msgid "writing public key to '%s'\n"
msgstr "записуємо відкритий ключ до «%s»\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "не знайдено придатного до запису сховища відкритих ключів: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "помилка під час спроби запису до сховища відкритих ключів «%s»: %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "відкритий і закритий ключі створено і підписано.\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
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"
@@@ -5245,7 -4111,6 +5240,7 @@@ msgstr "
"Зауважте, що цей ключ не може бути використано для шифрування. Ви можете\n"
"скористатися командою «--edit-key» для створення підключа з цією метою.\n"
- #: g10/keygen.c:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5253,7 -4118,6 +5248,7 @@@ msgstr "
"ключ було створено з позначкою на %lu секунд у майбутньому (часова петля або "
"проблема з годинником)\n"
- #: g10/keygen.c:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5261,19 -4125,15 +5256,19 @@@ msgstr "
"ключ було створено з позначкою на %lu секунду у майбутньому (часова петля "
"або проблема з годинником)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "ЗАУВАЖЕННЯ: створення підключів для ключів v3 несумісне з OpenPGP\n"
- #: g10/keygen.c:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
msgid "Secret parts of primary key are not available.\n"
msgstr "Закриті частини основного ключа недоступні.\n"
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Закриті частини основного ключа зберігаються на картці.\n"
- #: g10/keygen.c:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
msgid "Really create? (y/N) "
msgstr "Створити? (y/N або т/Н) "
@@@ -6012,23 -4726,18 +6007,23 @@@ msgstr "Це потрібна вам ф
msgid "unable to display photo ID!\n"
msgstr "показ фотоідентифікатора неможливий!\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "Причину не вказано"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "Ключ замінено"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "Ключ скомпрометовано"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "Ключ більше не використовується"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "Ідентифікатор користувача втратив чинність"
@@@ -6106,7 -4802,6 +6101,7 @@@ msgstr "
"Мінімальним рівнем довіри до цього ключа є %s\n"
"\n"
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "Ваше рішення? "
@@@ -6247,46 -4914,37 +6242,46 @@@ msgstr "УВАГА: цей ключ н�
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Певності у належності підпису його власнику немає.\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: пропущено: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: пропущено: відкритий ключ вимкнено\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: пропущено: відкритий ключ вже існує\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, c-format
msgid "can't encrypt to '%s'\n"
msgstr "не вдалося зашифрувати до «%s»\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "вказано параметр «%s», але не вказано коректних типових ключів\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "вказано параметр «%s», але не вказано параметр «%s»\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr ""
"Вами не вказано ідентифікатора користувача. (можете скористатися «-r»)\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr "Поточні отримувачі:\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6294,37 -4952,29 +6289,37 @@@ msgstr "
"\n"
"Вкажіть ідентифікатор користувача. Дані слід завершити порожнім рядком: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "Немає такого ідентифікатора користувача.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "пропущено: відкритий ключ вже встановлено для типового отримувача\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "Відкритий ключ вимкнено.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "пропущено: відкритий ключ вже встановлено\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "невідомий типовий отримувач «%s»\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "немає коректних адрес\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Зауваження: у ключі %s не передбачено можливості %s\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Зауваження: у ключі %s не передбачено переваг для %s\n"
@@@ -6427,7 -5055,6 +6422,7 @@@ msgid "Create a designated revocation c
msgstr ""
"Створити підписаний сертифікат відкликання для цього ключа? (y/N або т/Н) "
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "Призначено виведення у форматі ASCII.\n"
@@@ -6445,11 -5069,9 +6440,11 @@@ msgstr "Створено сертифі
msgid "no revocation keys found for \"%s\"\n"
msgstr "для «%s» не знайдено ключів відкликання\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "Це сертифікат відкликання для ключа OpenPGP:"
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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"
@@@ -6460,7 -5082,6 +6455,7 @@@ msgstr "
"Такий сертифікат відкликання не можна скасовувати після його\n"
"оприлюднення."
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6475,7 -5096,6 +6470,7 @@@ msgstr "
"можна знайти у розділах підручника з GnuPG щодо команди\n"
"gpg «--generate-revocation»."
- #: g10/revoke.c:577
++#: g10/revoke.c:590
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"
@@@ -6486,12 -5106,10 +6481,12 @@@ msgstr "
"редакторі, перш ніж імпортувати або оприлюднювати цей сертифікат\n"
"відкликання."
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, c-format
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "сертифікат відкликання збережено як «%s.rev»\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, c-format
msgid "secret key \"%s\" not found\n"
msgstr "закритий ключ «%s» не знайдено\n"
@@@ -6499,21 -5117,17 +6494,21 @@@
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr "«%s» відповідає декільком закритим ключам:\n"
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, c-format
msgid "error searching the keyring: %s\n"
msgstr "помилка під час спроби пошуку у сховищі ключів: %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Створити сертифікат відкликання для цього ключа? (y/N або т/Н) "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6533,33 -5147,26 +6528,33 @@@ msgstr "
"може зберігати дані друку, доступ до яких зможуть отримати\n"
"сторонні люди!\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "Будь ласка, вкажіть причину відкликання:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "Скасувати"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Ймовірно, вам варто тут вибрати %d)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Вкажіть необов’язковий опис; завершіть його порожнім рядком:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Причина відкликання: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(Опису не надано)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
msgid "Is this okay? (y/N) "
msgstr "Все правильно? (y/N або т/Н) "
@@@ -6972,10 -5505,6 +6967,10 @@@ msgstr "
msgid "TOFU DB error"
msgstr "помилка бази даних TOFU"
+#: 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
++#: g10/tofu.c:3408
#, c-format
msgid "error reading TOFU database: %s\n"
msgstr "помилка під час спроби читання бази даних TOFU: %s\n"
@@@ -7005,7 -5529,6 +7000,7 @@@ msgstr "додаємо стовпчи�
msgid "error opening TOFU database '%s': %s\n"
msgstr "помилка під час спроби відкрити бази даних TOFU «%s»: %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, c-format
msgid "error updating TOFU database: %s\n"
msgstr "помилка під час спроби оновлення бази даних TOFU: %s\n"
@@@ -7366,13 -5840,10 +7361,13 @@@ msgstr[2] "
" %s\n"
"для позначення ключа як помилкового.\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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, c-format
msgid "error opening TOFU database: %s\n"
msgstr "помилка під час спроби відкрити бази даних TOFU: %s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, 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"
@@@ -7380,7 -5851,6 +7375,7 @@@ msgstr "
"ПОПЕРЕДЖЕННЯ: шифруємо до %s, для якого не виявлено не відкликаних "
"ідентифікаторів користувача.\n"
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, c-format
msgid "error setting policy for key %s, user id \"%s\": %s"
msgstr ""
@@@ -7447,7 -5905,6 +7442,7 @@@ msgstr "використовуємо м
msgid "no need for a trustdb check\n"
msgstr "потреби у перевірці trustdb немає\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "наступну перевірку trustdb призначено на %s\n"
@@@ -7475,7 -5927,6 +7470,7 @@@ msgstr "будь ласка, скори
msgid "checking the trustdb\n"
msgstr "перевірка trustdb\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
@@@ -7483,7 -5934,6 +7478,7 @@@ msgstr[0] "оброблено %d клю
msgstr[1] "оброблено %d ключі"
msgstr[2] "оброблено %d ключів"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, c-format
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
@@@ -7491,16 -5941,13 +7486,16 @@@ msgstr[0] " (очищено %d знач
msgstr[1] " (очищено %d значення чинності)\n"
msgstr[2] " (очищено %d значень чинності)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "не знайдено ключів з необмеженою довірою\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "не знайдено відкритий ключ ключа з необмеженою довірою %s\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7508,7 -5955,6 +7503,7 @@@ msgstr "
"глибина: %d чинність: %3d підписано: %3d надійність: %d-, %dq, %dn, %dm, "
"%df, %du\n"
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "не вдалося оновити запис версії trustdb: помилка запису: %s\n"
@@@ -7942,55 -6302,42 +7937,55 @@@ msgstr "||Вкажіть ваш пін�
msgid "|N|Initial New PIN"
msgstr "|N|Початковий новий пінкод"
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr "запустити у режимі декількох серверів (основному режимі)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|встановити вказаний рівень діагностики"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
msgid "|FILE|write a log to FILE"
msgstr "|FILE|записувати журнал до файла"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr "|N|з’єднатися зі зчитувачем на вказаному порту"
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
msgid "|NAME|use NAME as ct-API driver"
msgstr "|NAME|використовувати вказаний драйвер ct-API"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|NAME|використовувати вказаний драйвер PC/SC"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
msgid "do not use the internal CCID driver"
msgstr "не використовувати вбудованого драйвера CCID"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr "|N|від’єднати бездіяльну вказану кількість секунд картку"
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr "не використовувати додаткову клавіатуру зчитувача"
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
msgid "deny the use of admin card commands"
msgstr "заборонити використання команд з адміністрування картки"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr "використовувати змінну довжину вхідних даних для зчитувача"
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Використання: @SCDAEMON@ [параметри] (-h — довідка)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
@@@ -7998,18 -6345,15 +7993,18 @@@ msgstr "
"Синтаксис: scdaemon [параметри] [команди [аргументи]]\n"
"Фонова служба карток пам’яті для @GNUPG@\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
"будь ласка, скористайтеся параметром «--daemon» для запуску програми у "
"фоновому режимі\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr "запущено запуск обробки для дескриптора %d\n"
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "роботу обробника для дескриптора %d перервано\n"
@@@ -8698,7 -6889,6 +8693,7 @@@ msgid "|USER-ID|use USER-ID as default
msgstr ""
"|USER-ID|використовувати ідентифікатор користувача як типовий закритий ключ"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "використовувати цей сервер ключів для пошуку"
@@@ -8756,17 -6936,14 +8751,17 @@@ msgstr "%s:%u: пропускаємо �
msgid "could not parse keyserver\n"
msgstr "не вдалося обробити сервер ключів\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "імпортуємо загальні сертифікати «%s»\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "підписування за допомогою «%s» неможливе: %s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr "некоректна команда (немає неявної команди)\n"
@@@ -9711,112 -7698,84 +9706,112 @@@ msgstr "мало бути вказан�
msgid "looking up '%s'\n"
msgstr "пошук «%s»\n"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr "показати вміст кешу CRL"
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
msgid "|FILE|load CRL from FILE into cache"
msgstr "|FILE|завантажити CRL з вказаного файла до кешу"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|отримати CRL з вказаної адреси"
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr "завершити роботу dirmngr"
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr "спорожнити кеш"
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr "|FILE|записувати журнал режиму сервера до файла"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
msgid "run without asking a user"
msgstr "запустити без запиту до користувача"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr "примусове завантаження застарілих САС"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr "дозволити надсилання запитів OCSP"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr "дозволити інтерактивну перевірку версії програмного забезпечення"
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr "заборонити використання HTTP"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr "заборонити використання LDAP"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr "ігнорувати точки поширення САС протоколу HTTP"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr "ігнорувати точки поширення САС протоколу LDAP"
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr "ігнорувати адреси служб OCSP з сертифікатами"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|переспрямувати всі запити HTTP на вказану адресу"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HOST|використовувати вказаний вузол для запитів LDAP"
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "не використовувати резервні вузли з --ldap-proxy"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
msgid "|FILE|read LDAP server list from FILE"
msgstr "|FILE|прочитати список серверів LDAP з вказаного файла"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr "додати виявлені у точках поширення CRL нові сервери до списку серверів"
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|встановити вказаний час очікування даних від LDAP"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|використовувати відповідач OCSP за вказаною адресою"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|відповідь OCSP підписано FPR"
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr "|N|повертати не більше за вказану кількість записів на запит"
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr "|FILE|використовувати сертифікати CA з файла для HKP крізь TLS"
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr "маршрутизувати увесь обмін даними з мережею через Tor"
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9826,11 -7785,9 +9821,11 @@@ msgstr "
"(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
"довідника (man) «info»)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Використання: @DIRMNGR@ [параметри] (-h — довідка)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9838,78 -7795,61 +9833,78 @@@ msgstr "
"Синтаксис: @DIRMNGR@ [параметри] [команда [аргументи]]\n"
"Доступ до сервера ключів, CRL та OCSP для @GNUPG@\n"
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "коректними рівнями зневаджування є: %s\n"
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, c-format
msgid "usage: %s [options] "
msgstr "використання: %s [параметри]"
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
msgid "colons are not allowed in the socket name\n"
msgstr "не можна використовувати двокрапки у назві сокета\n"
- #: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "помилка під час спроби отримання CRL з «%s»: %s\n"
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "помилка під час обробки CRL з «%s»: %s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: занадто довгий рядок — пропущено\n"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: виявлено некоректний відбиток\n"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: помилка під час читання: %s\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: беззмістовні дані наприкінці рядка проігноровано\n"
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
"отримано сигнал SIGHUP — повторне читання налаштувань та спорожнення кешу\n"
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr "отримано сигнал SIGUSR2 — дій не визначено\n"
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr "отримано сигнал SIGTERM — завершуємо роботу…\n"
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "отримано сигнал SIGTERM — підтримується %d активних з’єднань\n"
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
msgid "shutdown forced\n"
msgstr "примусове завершення роботи\n"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr "отримано сигнал SIGINT — негайне завершення роботи\n"
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "отримано сигнал %d — дій не визначено\n"
@@@ -10336,76 -8185,60 +10331,76 @@@ msgstr "Відповідачем OCSP �
msgid "OCSP responder returned an too old status\n"
msgstr "Відповідачем OCSP повернуто занадто застарілі дані щодо стану\n"
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "помилка assuan_inquire(%s): %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr "не вказано ldapserver"
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr "у ідентифікаторі сертифіката немає серійного номера"
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "помилка assuan_inquire: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "помилка fetch_cert_by_url: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, c-format
msgid "error sending data: %s\n"
msgstr "помилка під час спроби надсилання даних: %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "помилка start_cert_fetch: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "помилка fetch_next_cert: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "перевищено max_replies у %d\n"
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "не вдалося розмістити структуру керування: %s\n"
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "не вдалося розмістити контекст assuan: %s\n"
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "не вдалося ініціалізувати сервер: %s\n"
- #: dirmngr/server.c:2632
++#: dirmngr/server.c:2738
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "не вдалося зареєструвати команди за допомогою Assuan: %s\n"
- #: dirmngr/server.c:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "проблема з прийняттям Assuan: %s\n"
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "помилка обробки за допомогою Assuan: %s\n"
@@@ -10444,7 -8269,6 +10439,7 @@@ msgstr "коректний ланцюж
msgid "certificate should not have been used for CRL signing\n"
msgstr "сертифікат не мав використовуватися для підписування CRL\n"
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
msgid "quiet"
msgstr "без повідомлень"
@@@ -10537,258 -8341,193 +10532,258 @@@ msgstr "помилка надсилан
msgid "error sending standard options: %s\n"
msgstr "помилка під час спроби надсилання стандартних параметрів: %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr "Параметри керування діагностичним виводом"
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr "Параметри керування налаштуваннями"
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr "Параметри діагностики"
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr "Параметри керування захистом"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|завершувати строк дії ключів SSH за N секунд"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|встановити максимальний строк дії кешу пінкодів у секундах"
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|встановити максимальний строк дії ключа SSH у секундах"
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr "Параметри примусового використання правил паролів"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr "не дозволяти обхід правил паролів"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|встановити вказану мінімальну довжину нових паролів"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|вимагати у нових паролях не менше вказаної кількості нелітер"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|FILE|перевіряти нові паролі за зразком з вказаного файла"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
msgid "|N|expire the passphrase after N days"
msgstr "|N|завершувати строк дії паролів за вказану кількість днів"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
msgid "do not allow the reuse of old passphrases"
msgstr "не дозволяти повторне використання старих паролів"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|встановити вказаний час очікування Pinentry у секундах"
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|використовувати вказаний типовий закритий ключ"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAME|шифрувати також до вказаного ідентифікатора користувача"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|встановити замінники адреси електронної пошти"
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr "Налаштування для серверів ключів"
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
msgid "|URL|use keyserver at URL"
msgstr "|URL|використовувати сервер ключів за адресою"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr "дозволити пошук PKA (запити до DNS)"
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
"|MECHANISMS|використовувати вказаний механізм для пошуку ключів за адресою"
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr "заборонити доступ до dirmngr"
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "використовувати вказане кодування для паролів PKCS#12"
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr "не шукати у списках відкликаних сертифікатів кореневі сертифікати"
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr "Параметри керування форматом виведення"
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr "Параметри керування інтерактивністю та примусом"
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
msgstr "Параметри керування використанням Tor"
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr "Налаштування для серверів HTTP"
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr "використовувати загальносистемний проксі-сервер HTTP"
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr "Налаштування використання серверів LDAP"
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr "список серверів LDAP"
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr "Налаштування OCSP"
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr "OpenPGP"
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr "Закриті ключі"
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr "Картки пам’яті"
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr "S/MIME"
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
msgid "Network"
msgstr "Мережа"
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
msgid "Passphrase Entry"
msgstr "Введення пароля"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
msgid "Component not suitable for launching"
msgstr "Компонент не є придатним до запуску"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr "Помилка зовнішньої перевірки компонента %s"
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr "Зауважте, що специфікації груп буде проігноровано\n"
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, c-format
msgid "error closing '%s'\n"
msgstr "помилка під час спроби закрити «%s»\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, c-format
msgid "error parsing '%s'\n"
msgstr "помилка під час спроби обробити «%s»'\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr "показати список всіх компонентів"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr "перевірити всі програми"
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr "|COMPONENT|показати список параметрів"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr "|COMPONENT|змінити параметри"
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr "|COMPONENT|перевірити параметри"
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr "застосувати загальні типові значення"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
msgstr "|FILE|оновити файли налаштувань на основі файла ФАЙЛ"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr "отримати назви каталогів налаштувань для @GPGCONF@"
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
msgid "list global configuration file"
msgstr "показати загальний файл налаштувань"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
msgid "check global configuration file"
msgstr "перевірити загальний файл налаштувань"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
msgid "query the software version database"
msgstr "надіслати запит до бази даних версій програмного забезпечення"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr "перезавантажити всі або вказаний компонент"
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr "запустити вказаний компонент"
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr "завершити роботу вказаного компонента"
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "використати файл для виведення даних"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr "якщо можна, задіяти зміни у динамічному режимі"
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "Використання: @GPGCONF@ [параметри] (-h — довідка)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10796,15 -8535,12 +10791,15 @@@ msgstr "
"Синтаксис: @GPGCONF@ [параметри]\n"
"Керування параметрами налаштування інструментів системи @GNUPG@\n"
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr "Слід вказати один аргумент компонента"
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
msgid "Component not found"
msgstr "Компонент не знайдено"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
msgid "No argument allowed"
msgstr "Не можна вказувати аргументів"
diff --cc po/zh_CN.po
index 60c9e6d,9caeaef..fe5ec7f
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2009-07-09 10:03+0200\n"
"Last-Translator: Meng Jie <zuxyhere at eastday.com>\n"
"Language-Team: Chinese (simplified) <i18n-translation at lists.linux.net.cn>\n"
@@@ -162,26 -133,11 +162,26 @@@ msgstr "错误的密码
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:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -392,8 -309,6 +392,8 @@@ msgstr "
msgid "Please enter the new passphrase"
msgstr "更改密码"
- #: agent/gpg-agent.c:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
#, fuzzy
msgid ""
"@Options:\n"
@@@ -403,123 -318,91 +403,123 @@@ msgstr "
"选项：\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr ""
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "Key is superseded"
msgid "run in supervised mode"
msgstr "密钥被替换"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "详细模式"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "尽量减少提示信息"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr ""
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr ""
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "从‘%s’读取选项\n"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr ""
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
#, fuzzy
msgid "use a log file for the server"
msgstr "在公钥服务器上搜寻密钥"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "导入后不更新信任度数据库"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, fuzzy
msgid "|NAME|accept some commands via NAME"
msgstr "|某甲|为收件者“某甲”加密"
- #: agent/gpg-agent.c:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr ""
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr ""
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr ""
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr ""
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, fuzzy
msgid "disallow the use of an external password cache"
msgstr "生成密码的时候发生错误：%s\n"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
#, fuzzy
msgid "allow presetting passphrase"
msgstr "生成密码的时候发生错误：%s\n"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
#, fuzzy
#| msgid "not supported"
msgid "enable ssh support"
msgstr "未被支持"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
#, fuzzy
#| msgid "not supported"
msgid "enable putty support"
@@@ -528,169 -411,121 +528,164 @@@ msgstr "未被支持
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
- #: agent/gpg-agent.c:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
#, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, 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:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 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:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "从‘%s’读取选项\n"
- #: agent/gpg-agent.c:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, 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:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "无法建立‘%s’：%s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
- #: agent/gpg-agent.c:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "获取新 PIN 时出错：%s\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "警告：扩展模块‘%s’权限不安全\n"
- #: agent/gpg-agent.c:2241 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
- #, fuzzy, c-format
- msgid "listen() failed: %s\n"
- msgstr "更新失败：%s\n"
-
- #: agent/gpg-agent.c:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "正在将私钥写至`%s'\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, fuzzy, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "fstat(%d) 在 %s 中出错：%s\n"
- #: agent/gpg-agent.c:2327
++#: agent/gpg-agent.c:2351
#, fuzzy, c-format
msgid "can't use '%s' as home directory\n"
msgstr "无法建立目录‘%s’：%s\n"
- #: agent/gpg-agent.c:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
- #: agent/gpg-agent.c:2771
++#: agent/gpg-agent.c:2795
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "更新私钥失败：%s\n"
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s：已跳过：%s\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
@@@ -706,8 -539,6 +701,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -715,9 -546,6 +710,9 @@@ msgstr "
"@指令：\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -771,8 -591,6 +766,8 @@@ msgstr "已取消
msgid "error while asking for the passphrase: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, fuzzy, c-format
msgid "error opening '%s': %s\n"
msgstr "‘%s’中出错：%s\n"
@@@ -958,8 -741,6 +953,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "读取‘%s’时出错：%s\n"
@@@ -1436,7 -1119,6 +1431,7 @@@ msgstr "
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
#, fuzzy
msgid "out of core\n"
msgstr "可选"
@@@ -1495,8 -1166,6 +1490,8 @@@ msgstr "找不到公钥 %s：%s\n
msgid "waiting for lock %s...\n"
msgstr "等待‘%s’上的锁\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
@@@ -1668,8 -1300,6 +1663,8 @@@ msgstr "OpenPGP 卡不可用：%s\n
msgid "OpenPGP card no. %s detected\n"
msgstr "检测到 OpenPGP 卡号 %s\n"
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
msgid "can't do this in batch mode\n"
msgstr "在批处理模式中无法完成此操作\n"
@@@ -1683,10 -1311,6 +1678,10 @@@ msgstr "在 %s 模式中不允许使用
msgid "Reset Code not or not anymore available\n"
msgstr "私钥部分不可用\n"
+#: g10/card-util.c:142 g10/card-util.c:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "您的选择？ "
@@@ -1743,17 -1354,11 +1738,17 @@@ msgstr "错误：合成的姓名太长(
msgid "URL to retrieve public key: "
msgstr "获取公钥的 URL："
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, fuzzy, c-format
#| msgid "error reading `%s': %s\n"
msgid "error reading '%s': %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
@@@ -1803,7 -1397,6 +1798,7 @@@ msgstr "针对密钥的操作无法实�
msgid "not an OpenPGP card"
msgstr "不是一个 OpenPGP 卡"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, c-format
msgid "error getting current key info: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
@@@ -1839,13 -1426,10 +1834,13 @@@ msgstr "您想要用多大的密钥尺�
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr ""
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "舍入到 %u 位\n"
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
@@@ -1904,9 -1478,6 +1899,9 @@@ msgstr " (2) 加密密钥\n
msgid " (3) Authentication key\n"
msgstr " (3) 认证密钥\n"
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "无效的选择。\n"
@@@ -2038,22 -1579,14 +2033,22 @@@ msgstr "--output 在这个命令中不�
msgid "can't open '%s'\n"
msgstr "无法打开‘%s’\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "读取密钥区块时发生错误：%s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
#| msgid "key \"%s\" not found: %s\n"
msgid "key \"%s\" not found\n"
@@@ -2148,8 -1663,6 +2143,8 @@@ msgid "
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, 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"
@@@ -2177,7 -1686,6 +2172,7 @@@ msgstr "强行使用的 %s (%d)对称�
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s 已经加密给：“%s”\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2294,26 -1778,20 +2289,26 @@@ msgstr "%s：已跳过：%s\n
msgid "writing to '%s'\n"
msgstr "正在写入‘%s’\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "密钥 %s：密钥在卡上——已跳过\n"
- #: g10/export.c:1904
++#: g10/export.c:1909
msgid "exporting secret keys not allowed\n"
msgstr "不允许导出私钥\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n"
- #: g10/export.c:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "警告：没有导出任何东西\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/plaintext.c:167 g10/plaintext.c:190
#, fuzzy, c-format
#| msgid "error creating `%s': %s\n"
msgid "error creating '%s': %s\n"
@@@ -2323,13 -1800,10 +2318,13 @@@ msgstr "建立‘%s’时发生错误�
msgid "[User ID not found]"
msgstr "[找不到用户标识]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "无效的列表选项\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2339,61 -1812,50 +2334,61 @@@
msgid "error looking up: %s\n"
msgstr "‘%s’中出错：%s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "建立钥匙环‘%s’时发生错误：%s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, fuzzy, c-format
#| msgid "automatically retrieved `%s' via %s\n"
msgid "automatically retrieved '%s' via %s\n"
msgstr "自动获取‘%s’，通过 %s\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "建立‘%s’时发生错误：%s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
#, fuzzy
msgid "No fingerprint"
msgstr "CA 指纹："
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "找不到私钥“%s”：%s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "unusable secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "不可用的私钥"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "unusable secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "不可用的私钥"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
- #: g10/getkey.c:3716
++#: g10/getkey.c:3724
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子钥 %s 而非主钥 %s\n"
- #: g10/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
msgid "valid values for option '%s':\n"
msgstr "无效的列表选项\n"
@@@ -2602,7 -2018,6 +2597,7 @@@ msgstr "使用标准的文本模式
msgid "|FILE|write output to FILE"
msgstr "从‘%s’读取选项\n"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "不做任何改变"
@@@ -3003,7 -2345,6 +2998,7 @@@ msgstr "%s：%d：无效的 auto-key-lo
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清单\n"
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "警告：程序可能会创建核心内存转储！\n"
@@@ -3022,7 -2360,6 +3017,7 @@@ msgstr "%s 不可与 %s 并用\n
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义！\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr ""
@@@ -3031,7 -2367,6 +3026,7 @@@
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
- #: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
@@@ -3094,8 -2415,6 +3089,8 @@@ msgstr "无效的个人压缩算法首�
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 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"
@@@ -3228,7 -2521,6 +3223,7 @@@ msgstr "从这个钥匙环里取用密�
msgid "make timestamp conflicts only a warning"
msgstr "把时间戳矛盾仅视为警告"
- #: g10/gpgv.c:84 sm/gpgsm.c:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|FD|把状态信息写入文件描述符 FD"
@@@ -4551,7 -3569,6 +4546,7 @@@ msgstr "您确定仍然想要增加吗�
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr ""
@@@ -4850,53 -3806,41 +4845,53 @@@ msgstr "太多散列算法首选项\n
msgid "too many compression preferences\n"
msgstr "太多首选压缩算法\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, fuzzy, c-format
#| msgid "invalid item `%s' in preference string\n"
msgid "invalid item '%s' in preference string\n"
msgstr "首选项字符串里有无效项‘%s’\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "正在写入直接签名\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "正在写入自身签名\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "正在写入密钥绑定签名\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "密钥尺寸无效：改用 %u 位\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "密钥尺寸舍入到 %u 位\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
msgid "Sign"
msgstr "签名"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr "验证"
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
msgid "Encrypt"
msgstr "加密"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr "认证"
@@@ -4910,158 -3854,127 +4905,158 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr "%s 密钥可能的操作："
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr "目前允许的操作："
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) 选择是否用于签名\n"
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) 选择是否用于加密\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) 选择是否用于认证\n"
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) 已完成\n"
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "请选择您要使用的密钥种类：\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA 和 ElGamal (默认)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA 和 ElGamal (默认)\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (仅用于签名)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (仅用于签名)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (仅用于加密)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (仅用于加密)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (自定义用途)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (自定义用途)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, fuzzy, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) DSA 和 ElGamal (默认)\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, fuzzy, c-format
#| msgid " (%d) DSA (sign only)\n"
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) DSA (仅用于签名)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, fuzzy, c-format
#| msgid " (%d) DSA (set your own capabilities)\n"
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) DSA (自定义用途)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, fuzzy, c-format
#| msgid " (%d) RSA (encrypt only)\n"
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) RSA (仅用于加密)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, fuzzy, c-format
msgid " (%d) Existing key\n"
msgstr " (2) 加密密钥\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
#, fuzzy
msgid "Enter the keygrip: "
msgstr "输入注记："
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr ""
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
#, fuzzy
msgid "No key with this keygrip\n"
msgstr "没有索引为 %d 的子钥\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "舍入到 %u 位\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "您想要用多大的密钥尺寸？(%u)"
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "您想要用多大的密钥尺寸？(%u)"
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "您所要求的密钥尺寸是 %u 位\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
#, fuzzy
#| msgid "Please select what kind of key you want:\n"
msgid "Please select which elliptic curve you want:\n"
msgstr "请选择您要使用的密钥种类：\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5077,7 -3990,6 +5072,7 @@@ msgstr "
" <n>m = 密钥在 n 月后过期\n"
" <n>y = 密钥在 n 年后过期\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5093,38 -4005,30 +5088,38 @@@ msgstr "
" <n>m = 签名在 n 月后过期\n"
" <n>y = 签名在 n 年后过期\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "密钥的有效期限是？(0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "签名的有效期限是多久？(%s) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "无效的数值\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
msgid "Key does not expire at all\n"
msgstr "密钥永远不会过期\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
msgid "Signature does not expire at all\n"
msgstr "签名永远不会过期\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, c-format
msgid "Key expires at %s\n"
msgstr "密钥于 %s 过期\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, c-format
msgid "Signature expires at %s\n"
msgstr "签名于 %s 过期\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -5132,11 -4036,9 +5127,11 @@@ msgstr "
"您的系统无法显示 2038 年以后的日期。\n"
"不过，它可以正确处理 2106 年之前的年份。\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
msgid "Is this correct? (y/N) "
msgstr "以上正确吗？(y/n)"
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5147,7 -4049,6 +5142,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5163,50 -4064,39 +5158,50 @@@ msgstr "
" “Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>”\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "真实姓名："
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "姓名含有无效的字符\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用数字开头\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五个字符长\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "电子邮件地址："
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "电子邮件地址无效\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "注释："
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "注释含有无效的字符\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, fuzzy, c-format
#| msgid "You are using the `%s' character set.\n"
msgid "You are using the '%s' character set.\n"
msgstr "您正在使用‘%s’字符集。\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5217,7 -4107,6 +5212,7 @@@ msgstr "
" “%s”\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
@@@ -5232,35 -4121,28 +5227,35 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
#, fuzzy
#| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "请先改正错误\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
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"
@@@ -5270,13 -4152,10 +5265,13 @@@ msgstr "
"我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
"鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "生成密钥失败：%s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5284,71 -4163,58 +5279,71 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "密钥已存在\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
#, fuzzy
#| msgid "Use this key anyway? (y/N) "
msgid "Create anyway? (y/N) "
msgstr "无论如何还是使用这把密钥吗？(y/N)"
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "生成新密钥\n"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "密钥生成已取消。\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, fuzzy, c-format
#| msgid "can't create backup file `%s': %s\n"
msgid "can't create backup file '%s': %s\n"
msgstr "不能创建备份文件‘%s’：%s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, fuzzy, c-format
#| msgid "NOTE: backup of card key saved to `%s'\n"
msgid "Note: backup of card key saved to '%s'\n"
msgstr "注意：卡密钥的备份已保存到‘%s’\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "正在将公钥写至`%s'\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可写的公钥钥匙环：%s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error writing public keyring '%s': %s\n"
msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "公钥和私钥已经生成并经签名。\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
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"
@@@ -5356,33 -4222,27 +5351,33 @@@ msgstr "
"请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
"生成用于加密的子钥。\n"
- #: g10/keygen.c:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
- #: g10/keygen.c:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
#, 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:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
msgid "Secret parts of primary key are not available.\n"
msgstr "主钥的私钥部分无法取用。\n"
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主钥的私钥部分存储在卡上。\n"
- #: g10/keygen.c:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
msgid "Really create? (y/N) "
msgstr "真的要建立吗？(y/N)"
@@@ -6128,23 -4842,18 +6123,23 @@@ msgstr "这张照片正确吗？(y/N/q)
msgid "unable to display photo ID!\n"
msgstr "无法显示照片标识！\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "未指定原因"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "密钥被替换"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "密钥已泄漏"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "密钥不再使用"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "用户标识不再有效"
@@@ -6221,7 -4917,6 +6216,7 @@@ msgstr "
"这把密钥的最小信任等级为：%s\n"
"\n"
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "您的决定是什么？"
@@@ -6361,46 -5028,37 +6356,46 @@@ msgstr "警告：这把密钥未经有�
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " 这份签名并不一定属于它所声称的持有者\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s：已跳过：%s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s：已跳过：公钥已被禁用\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: 已跳过：公钥已存在\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "无法连接至‘%s’：%s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr "当前收件人：\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6408,37 -5066,29 +6403,37 @@@ msgstr "
"\n"
"输入用户标识。以空白行结束："
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "没有这个用户标识。\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "已跳过：公钥已被设为默认收件者\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "公钥被禁用。\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "已跳过：公钥已被设定\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "未知的默认收件者“%s”\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "没有有效的地址\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "密钥 %s：没有有效的用户标识\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "密钥 %s：没有有效的用户标识\n"
@@@ -6543,7 -5171,6 +6538,7 @@@ msgstr "私钥可用。\n
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "要为这把密钥建立一份指定吊销者证书吗？(y/N)"
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "已强行使用 ASCII 封装过的输出。\n"
@@@ -6561,20 -5185,17 +6556,20 @@@ msgstr "已建立吊销证书。\n
msgid "no revocation keys found for \"%s\"\n"
msgstr "没有找到“%s”的吊销密钥\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
#, fuzzy
#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "要为这把密钥建立一份吊销证书吗？(y/N)"
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
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"
@@@ -6583,20 -5204,17 +6578,20 @@@
"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
- #: g10/revoke.c:577
++#: g10/revoke.c:590
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "已建立吊销证书。\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6605,22 -5223,18 +6600,22 @@@ msgstr "找不到私钥“%s”：%s\n
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring `%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "建立钥匙环‘%s’时发生错误：%s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "要为这把密钥建立一份吊销证书吗？(y/N)"
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6638,33 -5252,26 +6633,33 @@@ msgstr "
"小心：您的机器上的打印系统可能会在打印过程中把这些数据临时在某个其他\n"
"人也能够看得到的地方！\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "请选择吊销的原因：\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "取消"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(也许您会想要在这里选择 %d)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "请输入描述(可选)；以空白行结束：\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "吊销原因：%s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(不给定描述)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
msgid "Is this okay? (y/N) "
msgstr "这样可以吗？ (y/N)"
@@@ -7059,10 -5592,6 +7054,10 @@@ msgstr "生成密码的时候发生错�
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
msgid "error reading TOFU database: %s\n"
msgstr "读取‘%s’时出错：%s\n"
@@@ -7094,7 -5618,6 +7089,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "‘%s’中出错：%s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
msgid "error updating TOFU database: %s\n"
msgstr "读取‘%s’时出错：%s\n"
@@@ -7407,18 -5881,14 +7402,18 @@@ msgid_plural "
msgstr[0] ""
msgstr[1] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, fuzzy, c-format
msgid "error opening TOFU database: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring `%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7482,7 -5940,6 +7477,7 @@@ msgstr "使用 %s 信任模型\n
msgid "no need for a trustdb check\n"
msgstr "不需要检查信任度数据库\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "下次信任度数据库检查将于 %s 进行\n"
@@@ -7512,7 -5964,6 +7507,7 @@@ msgstr "请执行一次 --check-trustdb
msgid "checking the trustdb\n"
msgstr "正在检查信任度数据库\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
#| msgid "%lu keys processed so far\n"
msgid "%d key processed"
@@@ -7520,7 -5971,6 +7515,7 @@@ msgid_plural "%d keys processed
msgstr[0] "目前已处理 %lu 把密钥\n"
msgstr[1] "目前已处理 %lu 把密钥\n"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7528,23 -5978,19 +7523,23 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
msgstr[1] "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "没有找到任何绝对信任的密钥\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
"深度：%d 有效性：%3d 已签名：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n"
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
@@@ -7972,73 -6332,57 +7967,73 @@@ msgstr "||请输入 PIN%%0A[完成的�
msgid "|N|Initial New PIN"
msgstr "新的 PIN"
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr ""
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "从‘%s’读取选项\n"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr ""
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
msgid "|NAME|use NAME as ct-API driver"
msgstr ""
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
msgid "|NAME|use NAME as PC/SC driver"
msgstr ""
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
msgid "do not use the internal CCID driver"
msgstr ""
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr ""
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr ""
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
#, fuzzy
msgid "deny the use of admin card commands"
msgstr "显示管理员命令"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8759,7 -6950,6 +8754,7 @@@ msgstr "从这个钥匙环里取用密�
msgid "|USER-ID|use USER-ID as default secret key"
msgstr ""
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
@@@ -8820,17 -7000,14 +8815,17 @@@ msgstr " s = 跳过这把密钥\n
msgid "could not parse keyserver\n"
msgstr "无法解析公钥服务器 URL\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, fuzzy, c-format
msgid "importing common certificates '%s'\n"
msgstr "生成密码的时候发生错误：%s\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, fuzzy, c-format
msgid "can't sign using '%s': %s\n"
msgstr "无法存取‘%s’：%s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@@ -9786,117 -7773,89 +9781,117 @@@ msgstr "
msgid "looking up '%s'\n"
msgstr ""
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr ""
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
#, fuzzy
msgid "|FILE|load CRL from FILE into cache"
msgstr "从‘%s’读取选项\n"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr ""
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr ""
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr ""
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr ""
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
#, fuzzy
#| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
msgstr "要不保存而离开吗？(y/N)"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr ""
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr ""
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr ""
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr ""
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr ""
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
#, fuzzy
msgid "|FILE|read LDAP server list from FILE"
msgstr "从‘%s’读取选项\n"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
#, fuzzy
msgid "|URL|use OCSP responder at URL"
msgstr "无法解析公钥服务器 URL\n"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr ""
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
#, fuzzy
#| msgid ""
#| "@\n"
@@@ -9909,95 -7868,76 +9904,95 @@@ msgstr "
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
#, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "用法：gpg [选项] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
#, 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:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, 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:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, fuzzy, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "列太长"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "指纹无效"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "%s:%u: read error: %s\n"
msgstr "读取‘%s’错误：%s\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
#, fuzzy
#| msgid "not forced"
msgid "shutdown forced\n"
msgstr "可选"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
@@@ -10449,78 -8298,62 +10444,78 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "签名时失败： %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "签名时失败： %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "读取‘%s’时出错：%s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "不能创建备份文件‘%s’：%s\n"
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s：建立散列表失败：%s\n"
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
#, 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:2632
++#: dirmngr/server.c:2738
#, 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:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10564,7 -8389,6 +10559,7 @@@ msgstr "首选项‘%s’重复\n
msgid "certificate should not have been used for CRL signing\n"
msgstr ""
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
#, fuzzy
msgid "quiet"
msgstr "quit"
@@@ -10657,286 -8461,218 +10652,286 @@@ msgstr "签名时失败： %s\n
msgid "error sending standard options: %s\n"
msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr ""
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr ""
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr ""
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr ""
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr ""
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "从导出的子钥中删除所有密码"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "生成密码的时候发生错误：%s\n"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
msgid "|N|set the Pinentry timeout to N seconds"
msgstr ""
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr ""
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|某甲|为收件者“某甲”加密"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr ""
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr ""
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "无法解析公钥服务器 URL\n"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr ""
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr ""
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr ""
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr ""
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr ""
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr ""
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
msgid "Options controlling the use of Tor"
msgstr ""
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr ""
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr ""
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr ""
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr ""
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr ""
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
msgid "OpenPGP"
msgstr ""
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
msgid "Smartcards"
msgstr ""
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
msgid "S/MIME"
msgstr ""
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
#, fuzzy
#| msgid "network error"
msgid "Network"
msgstr "网络错误"
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
msgid "Passphrase Entry"
msgstr "错误的密码"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
#, fuzzy
msgid "Component not suitable for launching"
msgstr "找不到公钥"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr ""
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr ""
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, fuzzy, c-format
msgid "error closing '%s'\n"
msgstr "‘%s’中出错：%s\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
#| msgid "error in `%s': %s\n"
msgid "error parsing '%s'\n"
msgstr "‘%s’中出错：%s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr ""
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr ""
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr ""
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr ""
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr ""
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr ""
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
msgid "|FILE|update configuration files using FILE"
msgstr ""
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr ""
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
#, fuzzy
msgid "list global configuration file"
msgstr "未知的配置项‘%s’\n"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
#, fuzzy
msgid "check global configuration file"
msgstr "未知的配置项‘%s’\n"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "更新信任度数据库"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr ""
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr ""
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr ""
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "指定输出文件"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr ""
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
#, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
#, fuzzy
msgid "Component not found"
msgstr "找不到公钥"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
#, fuzzy
msgid "No argument allowed"
msgstr "不允许使用管理员命令\n"
diff --cc po/zh_TW.po
index a118ccf,51b3798..bde39b2
--- 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-11-20 12:04+0100\n"
++"POT-Creation-Date: 2017-12-20 09:14+0100\n"
"PO-Revision-Date: 2017-11-02 17:42+0100\n"
"Last-Translator: Jedi Lin <Jedi at Jedi.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@@ -163,25 -134,10 +163,25 @@@ msgstr "不良的密語
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:895
- #: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4609
++#: g10/exec.c:484 g10/export.c:1265 g10/gpg.c:1318 g10/keygen.c:4631
+#: 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:852
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
+#: g10/decrypt.c:152 g10/encrypt.c:217 g10/encrypt.c:564 g10/gpg.c:1319
- #: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3681
++#: g10/import.c:334 g10/import.c:478 g10/import.c:646 g10/keygen.c:3698
+#: g10/keyring.c:1657 g10/openfile.c:195 g10/openfile.c:209
+#: 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:2179 sm/gpgsm.c:2209 sm/gpgsm.c:2247 sm/qualified.c:66
++#: sm/gpgsm.c:2181 sm/gpgsm.c:2211 sm/gpgsm.c:2249 sm/qualified.c:66
+#: dirmngr/certcache.c:396 dirmngr/certcache.c:473 dirmngr/certcache.c:475
- #: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1703
++#: dirmngr/crlcache.c:2417 dirmngr/dirmngr.c:1716
#, c-format
msgid "can't open '%s': %s\n"
msgstr "無法開啟 '%s': %s\n"
@@@ -376,8 -293,6 +376,8 @@@ msgstr "請輸入密語至%0A以保護�
msgid "Please enter the new passphrase"
msgstr "請輸入新的密語"
- #: agent/gpg-agent.c:154 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:156 agent/preset-passphrase.c:73 scd/scdaemon.c:111
+#: tools/gpg-check-pattern.c:69
msgid ""
"@Options:\n"
" "
@@@ -385,138 -300,99 +385,138 @@@ msgstr "
"@選項:\n"
" "
- #: agent/gpg-agent.c:156 scd/scdaemon.c:115 dirmngr/dirmngr.c:162
++#: agent/gpg-agent.c:158 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
msgid "run in daemon mode (background)"
msgstr "以服務模式執行 (背景)"
- #: agent/gpg-agent.c:157 scd/scdaemon.c:112 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:113 dirmngr/dirmngr.c:164
msgid "run in server mode (foreground)"
msgstr "以伺服器模式執行 (前景)"
- #: agent/gpg-agent.c:159 dirmngr/dirmngr.c:164
++#: agent/gpg-agent.c:161 dirmngr/dirmngr.c:167
#, fuzzy
#| msgid "run in server mode"
msgid "run in supervised mode"
msgstr "以伺服器模式執行"
- #: agent/gpg-agent.c:161 g10/gpg.c:596 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
++#: agent/gpg-agent.c:163 g10/gpg.c:596 g10/gpgv.c:76 kbx/kbxutil.c:88
++#: scd/scdaemon.c:117 sm/gpgsm.c:304 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:101 tools/symcryptrun.c:178
msgid "verbose"
msgstr "囉唆模式"
- #: agent/gpg-agent.c:162 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
++#: agent/gpg-agent.c:164 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:118
++#: sm/gpgsm.c:305 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
msgstr "盡量安靜些"
- #: agent/gpg-agent.c:163 scd/scdaemon.c:118 dirmngr/dirmngr.c:178
++#: agent/gpg-agent.c:165 scd/scdaemon.c:119 dirmngr/dirmngr.c:181
msgid "sh-style command output"
msgstr "sh 樣式的指令輸出"
- #: agent/gpg-agent.c:164 scd/scdaemon.c:119 dirmngr/dirmngr.c:179
++#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:182
msgid "csh-style command output"
msgstr "csh 樣式的指令輸出"
- #: agent/gpg-agent.c:165 scd/scdaemon.c:120 sm/gpgsm.c:335
- #: dirmngr/dirmngr.c:180 tools/symcryptrun.c:181
++#: agent/gpg-agent.c:167 scd/scdaemon.c:121 sm/gpgsm.c:335
++#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
msgid "|FILE|read options from FILE"
msgstr "|檔案|從指定檔案中讀取選項"
- #: agent/gpg-agent.c:174 scd/scdaemon.c:130 dirmngr/dirmngr.c:183
++#: agent/gpg-agent.c:176 scd/scdaemon.c:131 dirmngr/dirmngr.c:186
msgid "do not detach from the console"
msgstr "不要從 console 分離"
- #: agent/gpg-agent.c:179 tools/symcryptrun.c:180
++#: agent/gpg-agent.c:181 tools/symcryptrun.c:180
msgid "use a log file for the server"
msgstr "為伺服器使用日誌檔"
- #: agent/gpg-agent.c:181
++#: agent/gpg-agent.c:183
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|使用 PGM 做為 PIN-Entry 程式"
- #: agent/gpg-agent.c:186
++#: agent/gpg-agent.c:188
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|使用 PGM 做為 SCdaemon 程式"
- #: agent/gpg-agent.c:188
++#: agent/gpg-agent.c:190
msgid "do not use the SCdaemon"
msgstr "不要使用 SCdaemon"
- #: agent/gpg-agent.c:192
++#: agent/gpg-agent.c:194
#, fuzzy
#| msgid "|NAME|connect to host NAME"
msgid "|NAME|accept some commands via NAME"
msgstr "|名稱|連線至位於指定名稱的主機"
- #: agent/gpg-agent.c:208
++#: agent/gpg-agent.c:210
msgid "ignore requests to change the TTY"
msgstr "忽略變更 TTY 的要求"
- #: agent/gpg-agent.c:210
++#: agent/gpg-agent.c:212
msgid "ignore requests to change the X display"
msgstr "忽略變更 X display 的要求"
- #: agent/gpg-agent.c:213
++#: agent/gpg-agent.c:215
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|讓快取住的個人識別碼 (PIN) 在 N 秒後到期"
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:229
msgid "do not use the PIN cache when signing"
msgstr "簽署時不要使用個人識別碼 (PIN) 快取"
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:231
#, fuzzy
#| msgid "do not allow the reuse of old passphrases"
msgid "disallow the use of an external password cache"
msgstr "不允許重複使用舊密語"
- #: agent/gpg-agent.c:231
++#: agent/gpg-agent.c:233
msgid "disallow clients to mark keys as \"trusted\""
msgstr "不允許用戶端將金鑰標記為 \"已信任\""
- #: agent/gpg-agent.c:234
++#: agent/gpg-agent.c:236
msgid "allow presetting passphrase"
msgstr "允許預先設定密語"
- #: agent/gpg-agent.c:236
++#: agent/gpg-agent.c:238
msgid "disallow caller to override the pinentry"
msgstr ""
- #: agent/gpg-agent.c:239
++#: agent/gpg-agent.c:241
msgid "allow passphrase to be prompted through Emacs"
msgstr ""
- #: agent/gpg-agent.c:241
++#: agent/gpg-agent.c:243
msgid "enable ssh support"
msgstr "啟用 ssh 支援"
- #: agent/gpg-agent.c:243
++#: agent/gpg-agent.c:245
msgid "|ALGO|use ALGO to show ssh fingerprints"
msgstr ""
- #: agent/gpg-agent.c:246
++#: agent/gpg-agent.c:248
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:504 agent/preset-passphrase.c:96 agent/protect-tool.c:151
- #: g10/gpg.c:1037 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
++#: agent/gpg-agent.c:514 agent/preset-passphrase.c:96 agent/protect-tool.c:151
++#: g10/gpg.c:1037 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:284
++#: sm/gpgsm.c:557 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:125 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:133 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:513
++#: agent/gpg-agent.c:523
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
msgstr "用法: @GPG_AGENT@ [選項] (或用 -h 求助)"
- #: agent/gpg-agent.c:515
++#: agent/gpg-agent.c:525
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
@@@ -524,141 -400,100 +524,136 @@@ msgstr "
"語法: @GPG_AGENT@ [選項] [指令 [引數]]\n"
"@GNUPG@ 私鑰管理\n"
- #: agent/gpg-agent.c:560 g10/gpg.c:1228 scd/scdaemon.c:350 sm/gpgsm.c:705
- #: dirmngr/dirmngr.c:473
++#: agent/gpg-agent.c:570 g10/gpg.c:1228 scd/scdaemon.c:356 sm/gpgsm.c:705
++#: dirmngr/dirmngr.c:481
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "給定的除錯等級 '%s' 無效\n"
- #: agent/gpg-agent.c:913 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1607
- #: sm/gpgsm.c:1613
++#: agent/gpg-agent.c:923 g10/gpg.c:3738 g10/gpg.c:3762 sm/gpgsm.c:1608
++#: sm/gpgsm.c:1614
msgid "selected digest algorithm is invalid\n"
msgstr "所選的摘要演算法無效\n"
- #: agent/gpg-agent.c:1133 g10/gpg.c:2512 scd/scdaemon.c:503 sm/gpgsm.c:1041
- #: dirmngr/dirmngr.c:943
++#: agent/gpg-agent.c:1144 g10/gpg.c:2512 scd/scdaemon.c:509 sm/gpgsm.c:1041
++#: dirmngr/dirmngr.c:951
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "請注意: 沒有預設選項檔 '%s'\n"
- #: agent/gpg-agent.c:1144 agent/gpg-agent.c:2008 g10/gpg.c:2516
- #: scd/scdaemon.c:508 sm/gpgsm.c:1045 dirmngr/dirmngr.c:948
- #: dirmngr/dirmngr.c:1809 tools/symcryptrun.c:944
++#: agent/gpg-agent.c:1155 agent/gpg-agent.c:2031 g10/gpg.c:2516
++#: scd/scdaemon.c:514 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
++#: dirmngr/dirmngr.c:1822 tools/symcryptrun.c:944
#, c-format
msgid "option file '%s': %s\n"
msgstr "選項檔 '%s': %s\n"
- #: agent/gpg-agent.c:1152 g10/gpg.c:2523 scd/scdaemon.c:516 sm/gpgsm.c:1052
- #: dirmngr/dirmngr.c:956
++#: agent/gpg-agent.c:1163 g10/gpg.c:2523 scd/scdaemon.c:522 sm/gpgsm.c:1052
++#: dirmngr/dirmngr.c:964
#, c-format
msgid "reading options from '%s'\n"
msgstr "從 '%s' 讀取選項中\n"
- #: agent/gpg-agent.c:1275 g10/gpg.c:3689 scd/scdaemon.c:635 sm/gpgsm.c:1547
- #: dirmngr/dirmngr.c:1060 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:530
++#: agent/gpg-agent.c:1298 g10/gpg.c:3689 scd/scdaemon.c:645 sm/gpgsm.c:1548
++#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:595
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "請注意: '%s' 並不當成選項\n"
- #: agent/gpg-agent.c:2153 scd/scdaemon.c:1079 dirmngr/dirmngr.c:1204
++#: agent/gpg-agent.c:2176 scd/scdaemon.c:1090 dirmngr/dirmngr.c:1216
#, c-format
msgid "can't create socket: %s\n"
msgstr "無法建立 socket: %s\n"
- #: agent/gpg-agent.c:2170 scd/scdaemon.c:1092 dirmngr/dirmngr.c:1217
++#: agent/gpg-agent.c:2193 scd/scdaemon.c:1103 dirmngr/dirmngr.c:1229
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "socket 名稱 '%s' 太長\n"
- #: agent/gpg-agent.c:2209
++#: agent/gpg-agent.c:2232
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
- #: agent/gpg-agent.c:2220 scd/scdaemon.c:1116 dirmngr/dirmngr.c:1249
++#: agent/gpg-agent.c:2243 scd/scdaemon.c:1127 dirmngr/dirmngr.c:1261
msgid "error getting nonce for the socket\n"
msgstr "為 socket 取得 nonce 時出錯\n"
- #: agent/gpg-agent.c:2225 scd/scdaemon.c:1119 dirmngr/dirmngr.c:1252
++#: agent/gpg-agent.c:2248 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1264
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "綁定 socket 至 '%s' 時出錯: %s\n"
- #: agent/gpg-agent.c:2236 agent/gpg-agent.c:2275 scd/scdaemon.c:1127
- #: dirmngr/dirmngr.c:1261
++#: agent/gpg-agent.c:2259 agent/gpg-agent.c:2299 scd/scdaemon.c:1138
++#: dirmngr/dirmngr.c:1273
#, 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:2241 scd/scdaemon.c:1132 dirmngr/dirmngr.c:1266
- #, c-format
- msgid "listen() failed: %s\n"
- msgstr "listen() 失敗: %s\n"
-
- #: agent/gpg-agent.c:2249 scd/scdaemon.c:1139 dirmngr/dirmngr.c:1272
++#: agent/gpg-agent.c:2273 scd/scdaemon.c:1150 dirmngr/dirmngr.c:1285
#, c-format
msgid "listening on socket '%s'\n"
msgstr "正在候聽 socket '%s'\n"
- #: agent/gpg-agent.c:2269 agent/gpg-agent.c:2312 g10/exec.c:199
++#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2336 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:2272 agent/gpg-agent.c:2317 g10/openfile.c:398
++#: agent/gpg-agent.c:2296 agent/gpg-agent.c:2341 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:2323
++#: agent/gpg-agent.c:2347
#, c-format
msgid "stat() failed for '%s': %s\n"
msgstr "'%s' 的 stat() 失敗: %s\n"
- #: agent/gpg-agent.c:2327
++#: agent/gpg-agent.c:2351
#, c-format
msgid "can't use '%s' as home directory\n"
msgstr "無法使用 '%s' 做為家目錄\n"
- #: agent/gpg-agent.c:2479 scd/scdaemon.c:1155 dirmngr/dirmngr.c:2020
++#: agent/gpg-agent.c:2503 scd/scdaemon.c:1166 dirmngr/dirmngr.c:2037
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
- #: agent/gpg-agent.c:2686
++#: agent/gpg-agent.c:2710
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
- #: agent/gpg-agent.c:2691
++#: agent/gpg-agent.c:2715
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
- #: agent/gpg-agent.c:2766
++#: agent/gpg-agent.c:2790
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
- #: agent/gpg-agent.c:2771
++#: agent/gpg-agent.c:2795
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
- #: agent/gpg-agent.c:2993 scd/scdaemon.c:1335 dirmngr/dirmngr.c:2226
++#: agent/gpg-agent.c:3017 scd/scdaemon.c:1346 dirmngr/dirmngr.c:2250
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
- #: agent/gpg-agent.c:3081 scd/scdaemon.c:1387
++#: agent/gpg-agent.c:3105 scd/scdaemon.c:1398
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s 已停止\n"
- #: agent/gpg-agent.c:3219 common/simple-pwquery.c:247 g10/call-agent.c:260
++#: agent/gpg-agent.c:3243 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "在此階段中沒有執行中的 gpg-agent\n"
@@@ -674,8 -507,6 +669,8 @@@ msgstr "
"語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
"密碼快取維護\n"
+#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:199
- #: dirmngr/dirmngr.c:159 tools/gpgconf.c:71
++#: dirmngr/dirmngr.c:162 tools/gpgconf.c:73
msgid ""
"@Commands:\n"
" "
@@@ -683,9 -514,6 +678,9 @@@ msgstr "
"@指令:\n"
" "
+#: agent/protect-tool.c:115 g10/gpg.c:541 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
++#: sm/gpgsm.c:247 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:98 tools/symcryptrun.c:171
msgid ""
"@\n"
"Options:\n"
@@@ -738,8 -558,6 +733,8 @@@ msgstr "已取消\n
msgid "error while asking for the passphrase: %s\n"
msgstr "詢問密語時出錯: %s\n"
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1611
- #: tools/gpgconf.c:329
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1624
++#: tools/gpgconf.c:391
#, c-format
msgid "error opening '%s': %s\n"
msgstr "開啟 '%s' 時出錯: %s\n"
@@@ -920,8 -703,6 +915,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:1290
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1303
#, c-format
msgid "error forking process: %s\n"
msgstr "衍生執行程序時出錯: %s\n"
@@@ -1361,7 -1044,6 +1356,7 @@@ msgstr "\"%.50s\" 選項不明確\n
msgid "command \"%.50s\" is ambiguous\n"
msgstr "\"%.50s\" 指令不明確\n"
- #: common/argparse.c:401 dirmngr/dirmngr.c:1308
++#: common/argparse.c:401 dirmngr/dirmngr.c:1321
msgid "out of core\n"
msgstr "超出核心\n"
@@@ -1419,8 -1090,6 +1414,8 @@@ msgstr "未鎖定 '%s': %s\n
msgid "waiting for lock %s...\n"
msgstr "正在等候 `%s' 鎖定...\n"
- #: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:848
- #: dirmngr/dirmngr.c:857
++#: common/init.c:185 sm/gpgsm.c:938 dirmngr/dirmngr.c:856
++#: dirmngr/dirmngr.c:865
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
@@@ -1597,8 -1229,6 +1592,8 @@@ msgstr "沒有可用的 OpenPGP 卡片
msgid "OpenPGP card no. %s detected\n"
msgstr "偵測到 OpenPGP 卡片編號 %s\n"
+#: g10/card-util.c:99 g10/card-util.c:1967 g10/delkey.c:128 g10/keyedit.c:1419
- #: g10/keygen.c:4087 g10/revoke.c:214 g10/revoke.c:623
++#: g10/keygen.c:4104 g10/revoke.c:214 g10/revoke.c:636
msgid "can't do this in batch mode\n"
msgstr "無法在批次模式中這樣做\n"
@@@ -1610,10 -1238,6 +1605,10 @@@ msgstr "祇有第二版卡片纔能用�
msgid "Reset Code not or not anymore available\n"
msgstr "(再也) 沒有重設碼\n"
+#: g10/card-util.c:142 g10/card-util.c:1538 g10/card-util.c:1660
- #: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1774
- #: g10/keygen.c:1935 g10/keygen.c:2303 sm/certreqgen-ui.c:165
++#: g10/keyedit.c:393 g10/keyedit.c:414 g10/keyedit.c:428 g10/keygen.c:1791
++#: g10/keygen.c:1952 g10/keygen.c:2320 sm/certreqgen-ui.c:165
+#: sm/certreqgen-ui.c:249 sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "你要選哪一個? "
@@@ -1670,16 -1281,10 +1665,16 @@@ msgstr "錯誤: 合併後的名字太�
msgid "URL to retrieve public key: "
msgstr "取回公鑰的 URL: "
+#: g10/card-util.c:868 g10/decrypt-data.c:253 g10/import.c:363
+#: g10/import.c:617 g10/import.c:665 dirmngr/crlcache.c:656
+#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1649 tools/gpgconf.c:342 tools/gpgconf.c:388
++#: dirmngr/dirmngr.c:1662 tools/gpgconf.c:404 tools/gpgconf.c:450
#, c-format
msgid "error reading '%s': %s\n"
msgstr "讀取 '%s' 時出錯: %s\n"
- #: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2400
++#: g10/card-util.c:901 g10/decrypt-data.c:256 g10/export.c:2405
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "寫入 '%s' 時出錯: %s\n"
@@@ -1729,7 -1323,6 +1724,7 @@@ msgstr "不可能進行金鑰操作: %s
msgid "not an OpenPGP card"
msgstr "這不是 OpenPGP 卡片"
- #: g10/card-util.c:1213 g10/keygen.c:4106 g10/keygen.c:5144
++#: g10/card-util.c:1213 g10/keygen.c:4123 g10/keygen.c:5166
#, c-format
msgid "error getting current key info: %s\n"
msgstr "取得現用金鑰資訊時出錯: %s\n"
@@@ -1769,13 -1356,10 +1764,13 @@@ msgstr "你的認證金鑰想要用多�
msgid "The card will now be re-configured to generate a key of type: %s\n"
msgstr "這張卡片將重新加以組態, 以便產生 %u 位元的金鑰\n"
- #: g10/card-util.c:1369 g10/keygen.c:2112 g10/keygen.c:2144
++#: g10/card-util.c:1369 g10/keygen.c:2129 g10/keygen.c:2161
+#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "加大到 %u 位元\n"
- #: g10/card-util.c:1377 g10/keygen.c:2197 sm/certreqgen-ui.c:184
++#: g10/card-util.c:1377 g10/keygen.c:2214 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
@@@ -1829,9 -1403,6 +1824,9 @@@ msgstr " (2) 加密用金鑰\n
msgid " (3) Authentication key\n"
msgstr " (3) 憑證用金鑰\n"
+#: g10/card-util.c:1550 g10/card-util.c:1680 g10/keyedit.c:898
- #: g10/keygen.c:1800 g10/keygen.c:1828 g10/keygen.c:1942 g10/keygen.c:2050
- #: g10/keygen.c:2326 g10/revoke.c:825
++#: g10/keygen.c:1817 g10/keygen.c:1845 g10/keygen.c:1959 g10/keygen.c:2067
++#: g10/keygen.c:2343 g10/revoke.c:838
msgid "Invalid selection.\n"
msgstr "無效的選擇.\n"
@@@ -1963,22 -1504,14 +1958,22 @@@ msgstr "--output 在這個指令中沒�
msgid "can't open '%s'\n"
msgstr "無法開啟 '%s'\n"
- #: g10/delkey.c:79 g10/export.c:1887 g10/export.c:2163 g10/export.c:2284
- #: g10/getkey.c:502 g10/getkey.c:1974 g10/gpg.c:4967 g10/keyedit.c:1440
++#: g10/delkey.c:79 g10/export.c:1892 g10/export.c:2168 g10/export.c:2289
++#: g10/getkey.c:496 g10/getkey.c:1982 g10/gpg.c:4967 g10/keyedit.c:1440
+#: g10/keyedit.c:2330 g10/keyedit.c:2575 g10/keyedit.c:4272 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:1955 g10/getkey.c:1982 g10/getkey.c:4469
++#: g10/delkey.c:88 g10/export.c:1960 g10/getkey.c:1990 g10/getkey.c:4477
+#: g10/gpg.c:4975 g10/keyedit.c:2303 g10/keyserver.c:1262 g10/revoke.c:236
- #: g10/revoke.c:650 g10/tofu.c:2174
++#: g10/revoke.c:663 g10/tofu.c:2174
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "讀取金鑰區塊時出錯: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:578
++#: g10/delkey.c:118 g10/getkey.c:582
#, fuzzy, c-format
#| msgid "key \"%s\" not found: %s\n"
msgid "key \"%s\" not found\n"
@@@ -2066,8 -1581,6 +2061,8 @@@ msgid "
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
+#: g10/encrypt.c:631 g10/decrypt-data.c:105 g10/gpg.c:3882 g10/gpg.c:3922
- #: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1631
++#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1632
#, 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"
@@@ -2096,7 -1605,6 +2091,7 @@@ msgstr "強迫使用 %s (%d) 對稱式�
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s 已加密給: \"%s\"\n"
- #: g10/encrypt.c:998 g10/pkclist.c:1032 g10/pkclist.c:1083
++#: g10/encrypt.c:998 g10/pkclist.c:1027 g10/pkclist.c:1078
#, 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"
@@@ -2206,26 -1690,20 +2201,26 @@@ msgstr " - 已跳過
msgid "writing to '%s'\n"
msgstr "正在寫入 '%s'\n"
- #: g10/export.c:1709
++#: g10/export.c:1714
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "金鑰 %s: 金鑰資料在卡片上 - 已跳過\n"
- #: g10/export.c:1904
++#: g10/export.c:1909
msgid "exporting secret keys not allowed\n"
msgstr "不允許匯出私鑰\n"
- #: g10/export.c:1981
++#: g10/export.c:1986
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "金鑰 %s: PGP 2.x 型態的金鑰 - 已跳過\n"
- #: g10/export.c:2068
++#: g10/export.c:2073
msgid "WARNING: nothing exported\n"
msgstr "警告: 沒有匯出任何東西\n"
- #: g10/export.c:2365 g10/plaintext.c:152 g10/plaintext.c:161
++#: g10/export.c:2370 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"
@@@ -2234,14 -1711,11 +2229,14 @@@
msgid "[User ID not found]"
msgstr "[找不到使用者 ID]"
- #: g10/getkey.c:505 g10/getkey.c:518 g10/getkey.c:580 g10/getkey.c:1954
- #: g10/pkclist.c:992
++#: g10/getkey.c:499 g10/getkey.c:512 g10/getkey.c:584 g10/getkey.c:1962
++#: g10/pkclist.c:987
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
msgstr "\"%.50s\" 選項遺失了引數\n"
- #: g10/getkey.c:515
++#: g10/getkey.c:509
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
@@@ -2252,59 -1725,48 +2247,59 @@@
msgid "error looking up: %s\n"
msgstr "關閉 %s 時出錯: %s\n"
- #: g10/getkey.c:635
++#: g10/getkey.c:638
#, fuzzy, c-format
#| msgid "error creating keyring '%s': %s\n"
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
- #: g10/getkey.c:1452
++#: g10/getkey.c:1460
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "已自動取回 '%s' (經由 %s )\n"
- #: g10/getkey.c:1458
++#: g10/getkey.c:1466
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "取得 '%s' (經由 %s ) 時出錯: %s\n"
- #: g10/getkey.c:1460
++#: g10/getkey.c:1468
msgid "No fingerprint"
msgstr "沒有指紋"
- #: g10/getkey.c:1951 g10/revoke.c:642 g10/revoke.c:707
++#: g10/getkey.c:1959 g10/revoke.c:655 g10/revoke.c:720
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "找不到私鑰 \"%s\": %s\n"
- #: g10/getkey.c:2034
++#: g10/getkey.c:2042
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "|名字|使用指定名字做為預設私鑰"
- #: g10/getkey.c:2042
++#: g10/getkey.c:2050
#, fuzzy, c-format
#| msgid "|NAME|use NAME as default secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "|名字|使用指定名字做為預設私鑰"
- #: g10/getkey.c:2049
++#: g10/getkey.c:2057
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2878
++#: g10/getkey.c:2886
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
- #: g10/getkey.c:3716
++#: g10/getkey.c:3724
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子鑰 %s 來替換主鑰 %s\n"
- #: g10/getkey.c:4398 g10/gpg.c:2069
++#: g10/getkey.c:4406 g10/gpg.c:2069
#, fuzzy, c-format
#| msgid "invalid argument for option \"%.50s\"\n"
msgid "valid values for option '%s':\n"
@@@ -2500,7 -1916,6 +2495,7 @@@ msgstr "使用標準的文字模式
msgid "|FILE|write output to FILE"
msgstr "|檔案|將輸出寫入至指定檔案"
- #: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:101
++#: g10/gpg.c:607 kbx/kbxutil.c:90 sm/gpgsm.c:315 tools/gpgconf.c:103
msgid "do not make any changes"
msgstr "不要做任何改變"
@@@ -2871,7 -2213,6 +2866,7 @@@ msgstr "%s:%d: 無效的自動金鑰定
msgid "invalid auto-key-locate list\n"
msgstr "無效的自動金鑰定址清單\n"
- #: g10/gpg.c:3638 sm/gpgsm.c:1517
++#: g10/gpg.c:3638 sm/gpgsm.c:1518
msgid "WARNING: program may create a core file!\n"
msgstr "警告: 程式可能會傾印出核心檔!\n"
@@@ -2890,7 -2228,6 +2885,7 @@@ msgstr "%s 不允許跟 %s 併用!\n
msgid "%s makes no sense with %s!\n"
msgstr "%s 跟 %s 放在一起沒有意義!\n"
- #: g10/gpg.c:3676 sm/gpgsm.c:1534 dirmngr/dirmngr.c:1075
++#: g10/gpg.c:3676 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1087
msgid "WARNING: running with faked system time: "
msgstr "警告: 正在偽造的系統時間中執行: "
@@@ -2899,7 -2235,6 +2894,7 @@@
msgid "will not run with insecure memory due to %s\n"
msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
- #: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1601
++#: g10/gpg.c:3732 g10/gpg.c:3756 sm/gpgsm.c:1602
msgid "selected cipher algorithm is invalid\n"
msgstr "所選的編密演算法無效\n"
@@@ -2960,8 -2281,6 +2955,8 @@@ msgstr "無效的個人壓縮偏好\n
msgid "%s does not yet work with %s\n"
msgstr "%s 還沒辦法跟 %s 一起運作\n"
+#: g10/gpg.c:3888 g10/gpg.c:3934 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
++#: sm/gpgsm.c:1642 sm/gpgsm.c:1652 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"
@@@ -3092,7 -2385,6 +3087,7 @@@ msgstr "|檔案|從指定鑰匙圈檔�
msgid "make timestamp conflicts only a warning"
msgstr "僅把時間戳印矛盾視為警告"
- #: g10/gpgv.c:84 sm/gpgsm.c:348
++#: g10/gpgv.c:84 sm/gpgsm.c:348 tools/gpgconf.c:105
msgid "|FD|write status info to this FD"
msgstr "|檔案描述|把狀態資訊寫入此指定檔案描述"
@@@ -4400,7 -3418,6 +4395,7 @@@ msgstr "你確定仍然想要增加嗎
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "你不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
- #: g10/keyedit.c:3966 g10/keygen.c:2709
++#: g10/keyedit.c:3966 g10/keygen.c:2726
msgid "Such a user ID already exists on this key!\n"
msgstr "這把金鑰上已經有這樣子的使用者 ID 了!\n"
@@@ -4695,52 -3651,40 +4690,52 @@@ msgstr "摘要偏好過多\n
msgid "too many compression preferences\n"
msgstr "壓縮偏好過多\n"
- #: g10/keygen.c:472
++#: g10/keygen.c:489
#, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "偏好字串中含有無效的項目 '%s'\n"
- #: g10/keygen.c:951
++#: g10/keygen.c:968
msgid "writing direct signature\n"
msgstr "寫入直接簽章中\n"
- #: g10/keygen.c:997
++#: g10/keygen.c:1014
msgid "writing self signature\n"
msgstr "寫入自我簽章中\n"
- #: g10/keygen.c:1054
++#: g10/keygen.c:1071
msgid "writing key binding signature\n"
msgstr "寫入附鑰簽章中\n"
- #: g10/keygen.c:1419 g10/keygen.c:1424 g10/keygen.c:1476 g10/keygen.c:1481
- #: g10/keygen.c:1628 g10/keygen.c:1633
++#: g10/keygen.c:1436 g10/keygen.c:1441 g10/keygen.c:1493 g10/keygen.c:1498
++#: g10/keygen.c:1645 g10/keygen.c:1650
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "金鑰尺寸無效; 改用 %u 位元\n"
- #: g10/keygen.c:1430 g10/keygen.c:1487 g10/keygen.c:1495 g10/keygen.c:1639
++#: g10/keygen.c:1447 g10/keygen.c:1504 g10/keygen.c:1512 g10/keygen.c:1656
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "金鑰尺寸增大到 %u 位元\n"
- #: g10/keygen.c:1521
++#: g10/keygen.c:1538
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr "警告: 某些 OpenPGP 程式無法處理具有此摘要尺寸的 DSA 金鑰\n"
- #: g10/keygen.c:1695
++#: g10/keygen.c:1712
msgid "Sign"
msgstr "簽署"
- #: g10/keygen.c:1698
++#: g10/keygen.c:1715
msgid "Certify"
msgstr "保證"
- #: g10/keygen.c:1701
++#: g10/keygen.c:1718
msgid "Encrypt"
msgstr "加密"
- #: g10/keygen.c:1704
++#: g10/keygen.c:1721
msgid "Authenticate"
msgstr "鑑定"
@@@ -4754,150 -3698,119 +4749,150 @@@
#. a = Toggle authentication capability
#. q = Finish
#.
- #: g10/keygen.c:1723
++#: g10/keygen.c:1740
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
- #: g10/keygen.c:1750
++#: g10/keygen.c:1767
#, c-format
msgid "Possible actions for a %s key: "
msgstr "%s 金鑰可能的動作: "
- #: g10/keygen.c:1756
++#: g10/keygen.c:1773
msgid "Current allowed actions: "
msgstr "目前可進行的動作: "
- #: g10/keygen.c:1761
++#: g10/keygen.c:1778
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) 切換簽署性能\n"
- #: g10/keygen.c:1764
++#: g10/keygen.c:1781
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) 切換加密性能\n"
- #: g10/keygen.c:1767
++#: g10/keygen.c:1784
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) 切換鑑定性能\n"
- #: g10/keygen.c:1770
++#: g10/keygen.c:1787
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) 已完成\n"
- #: g10/keygen.c:1883 sm/certreqgen-ui.c:157
++#: g10/keygen.c:1900 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "請選擇你要使用的金鑰種類:\n"
- #: g10/keygen.c:1887
++#: g10/keygen.c:1904
#, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) RSA 和 RSA (預設)\n"
- #: g10/keygen.c:1891
++#: g10/keygen.c:1908
#, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA 和 Elgamal\n"
- #: g10/keygen.c:1894
++#: g10/keygen.c:1911
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (僅能用於簽署)\n"
- #: g10/keygen.c:1896
++#: g10/keygen.c:1913
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (僅能用於簽署)\n"
- #: g10/keygen.c:1902
++#: g10/keygen.c:1919
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (僅能用於加密)\n"
- #: g10/keygen.c:1904
++#: g10/keygen.c:1921
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (僅能用於加密)\n"
- #: g10/keygen.c:1910
++#: g10/keygen.c:1927
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (你能自己設定性能)\n"
- #: g10/keygen.c:1912
++#: g10/keygen.c:1929
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (你能自己設定性能)\n"
- #: g10/keygen.c:1918
++#: g10/keygen.c:1935
#, c-format
msgid " (%d) ECC and ECC\n"
msgstr " (%d) ECC 和 ECC\n"
- #: g10/keygen.c:1920
++#: g10/keygen.c:1937
#, c-format
msgid " (%d) ECC (sign only)\n"
msgstr " (%d) ECC (僅能用於簽署)\n"
- #: g10/keygen.c:1922
++#: g10/keygen.c:1939
#, c-format
msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) ECC (你能自己設定性能)\n"
- #: g10/keygen.c:1924
++#: g10/keygen.c:1941
#, c-format
msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) ECC (僅能用於加密)\n"
- #: g10/keygen.c:1928
++#: g10/keygen.c:1945
#, c-format
msgid " (%d) Existing key\n"
msgstr " (%d) 現有的金鑰\n"
- #: g10/keygen.c:2024 sm/certreqgen-ui.c:202
++#: g10/keygen.c:2041 sm/certreqgen-ui.c:202
msgid "Enter the keygrip: "
msgstr "請輸入金鑰鑰柄: "
- #: g10/keygen.c:2037 sm/certreqgen-ui.c:210
++#: g10/keygen.c:2054 sm/certreqgen-ui.c:210
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
msgstr "不是有效的金鑰鑰柄 (應該要是 40 位十六進制數值)\n"
- #: g10/keygen.c:2039 sm/certreqgen-ui.c:212
++#: g10/keygen.c:2056 sm/certreqgen-ui.c:212
msgid "No key with this keygrip\n"
msgstr "沒有金鑰有此金鑰鑰柄\n"
- #: g10/keygen.c:2123 g10/keygen.c:2137
++#: g10/keygen.c:2140 g10/keygen.c:2154
#, c-format
msgid "rounded to %u bits\n"
msgstr "加大到 %u 位元\n"
- #: g10/keygen.c:2178
++#: g10/keygen.c:2195
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
- #: g10/keygen.c:2186
++#: g10/keygen.c:2203
#, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "你的子鑰想要用多大的金鑰尺寸? (%u) "
- #: g10/keygen.c:2189 sm/certreqgen-ui.c:179
++#: g10/keygen.c:2206 sm/certreqgen-ui.c:179
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "你想要用多大的金鑰尺寸? (%u) "
- #: g10/keygen.c:2203 sm/certreqgen-ui.c:189
++#: g10/keygen.c:2220 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "你所要求的金鑰尺寸是 %u 位元\n"
- #: g10/keygen.c:2249
++#: g10/keygen.c:2266
msgid "Please select which elliptic curve you want:\n"
msgstr "請選擇你要使用的橢圓曲線:\n"
- #: g10/keygen.c:2421
++#: g10/keygen.c:2438
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -4913,7 -3826,6 +4908,7 @@@ msgstr "
" <n>m = 金鑰在 n 月後會到期\n"
" <n>y = 金鑰在 n 年後會到期\n"
- #: g10/keygen.c:2432
++#: g10/keygen.c:2449
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -4929,38 -3841,30 +4924,38 @@@ msgstr "
" <n>m = 簽章在 n 月後會到期\n"
" <n>y = 簽章在 n 年後會到期\n"
- #: g10/keygen.c:2455
++#: g10/keygen.c:2472
msgid "Key is valid for? (0) "
msgstr "金鑰的有效期限是多久? (0) "
- #: g10/keygen.c:2460
++#: g10/keygen.c:2477
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "簽章的有效期限是多久? (%s) "
- #: g10/keygen.c:2473 g10/keygen.c:2498
++#: g10/keygen.c:2490 g10/keygen.c:2515
msgid "invalid value\n"
msgstr "無效的數值\n"
- #: g10/keygen.c:2480
++#: g10/keygen.c:2497
msgid "Key does not expire at all\n"
msgstr "金鑰完全不會過期\n"
- #: g10/keygen.c:2481
++#: g10/keygen.c:2498
msgid "Signature does not expire at all\n"
msgstr "簽章完全不會過期\n"
- #: g10/keygen.c:2486
++#: g10/keygen.c:2503
#, c-format
msgid "Key expires at %s\n"
msgstr "金鑰將會在 %s 到期\n"
- #: g10/keygen.c:2487
++#: g10/keygen.c:2504
#, c-format
msgid "Signature expires at %s\n"
msgstr "簽章將會在 %s 到期.\n"
- #: g10/keygen.c:2491
++#: g10/keygen.c:2508
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@@ -4968,11 -3872,9 +4963,11 @@@ msgstr "
"你的系統無法顯示 2038 年以後的日期.\n"
"不過, 它可以正確處理直到 2106 年之前的年份.\n"
- #: g10/keygen.c:2504
++#: g10/keygen.c:2521
msgid "Is this correct? (y/N) "
msgstr "以上正確嗎? (y/N) "
- #: g10/keygen.c:2572
++#: g10/keygen.c:2589
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4986,7 -3888,6 +4981,7 @@@ msgstr "
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
- #: g10/keygen.c:2587
++#: g10/keygen.c:2604
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@@ -5001,49 -3902,38 +4996,49 @@@ msgstr "
" \"Ke-Huan Lin (Jedi) <Jedi at Jedi.org>\"\n"
"\n"
- #: g10/keygen.c:2606
++#: g10/keygen.c:2623
msgid "Real name: "
msgstr "真實姓名: "
- #: g10/keygen.c:2615
++#: g10/keygen.c:2632
msgid "Invalid character in name\n"
msgstr "姓名含有無效的字符\n"
- #: g10/keygen.c:2616
++#: g10/keygen.c:2633
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
msgstr ""
- #: g10/keygen.c:2620
++#: g10/keygen.c:2637
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用數字開頭\n"
- #: g10/keygen.c:2623
++#: g10/keygen.c:2640
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五個字符長\n"
- #: g10/keygen.c:2633
++#: g10/keygen.c:2650
msgid "Email address: "
msgstr "電子郵件地址: "
- #: g10/keygen.c:2639
++#: g10/keygen.c:2656
msgid "Not a valid email address\n"
msgstr "不是有效的電子郵件地址\n"
- #: g10/keygen.c:2648
++#: g10/keygen.c:2665
msgid "Comment: "
msgstr "註釋: "
- #: g10/keygen.c:2654
++#: g10/keygen.c:2671
msgid "Invalid character in comment\n"
msgstr "註釋含有無效的字符\n"
- #: g10/keygen.c:2690
++#: g10/keygen.c:2707
#, c-format
msgid "You are using the '%s' character set.\n"
msgstr "你正在使用 '%s' 字元集.\n"
- #: g10/keygen.c:2696
++#: g10/keygen.c:2713
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@@ -5054,7 -3944,6 +5049,7 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:2701
++#: g10/keygen.c:2718
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
@@@ -5069,31 -3958,24 +5064,31 @@@
#. o = Okay (ready, continue)
#. q = Quit
#.
- #: g10/keygen.c:2726
++#: g10/keygen.c:2743
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
- #: g10/keygen.c:2736
++#: g10/keygen.c:2753
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
- #: g10/keygen.c:2737
++#: g10/keygen.c:2754
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
- #: g10/keygen.c:2742
++#: g10/keygen.c:2759
msgid "Change (N)ame, (E)mail, or (Q)uit? "
msgstr "變更姓名(N), 電子郵件地址(E)或退出(Q)? "
- #: g10/keygen.c:2743
++#: g10/keygen.c:2760
msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
msgstr "變更姓名(N), 電子郵件地址(E)或確定(O)/退出(Q)? "
- #: g10/keygen.c:2762
++#: g10/keygen.c:2779
msgid "Please correct the error first\n"
msgstr "請先訂正錯誤\n"
- #: g10/keygen.c:2808
++#: g10/keygen.c:2825
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"
@@@ -5104,13 -3986,10 +5099,13 @@@ msgstr "
"(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
"這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
- #: g10/keygen.c:3913 g10/keygen.c:3980 g10/keygen.c:3997 g10/keygen.c:4020
- #: g10/keygen.c:4359 g10/keygen.c:4850 g10/keygen.c:5116 g10/keygen.c:5221
++#: g10/keygen.c:3930 g10/keygen.c:3997 g10/keygen.c:4014 g10/keygen.c:4037
++#: g10/keygen.c:4376 g10/keygen.c:4872 g10/keygen.c:5138 g10/keygen.c:5243
#, c-format
msgid "Key generation failed: %s\n"
msgstr "產生金鑰失敗: %s\n"
- #: g10/keygen.c:3922
++#: g10/keygen.c:3939
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5121,62 -4000,49 +5116,62 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3924
++#: g10/keygen.c:3941
msgid "Continue? (Y/n) "
msgstr "是否繼續? (Y/n) "
- #: g10/keygen.c:3945
++#: g10/keygen.c:3962
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "\"%s\" 的金鑰已存在\n"
- #: g10/keygen.c:3950
++#: g10/keygen.c:3967
msgid "Create anyway? (y/N) "
msgstr "無論如何還是要建立嗎? (y/N) "
- #: g10/keygen.c:3956
++#: g10/keygen.c:3973
msgid "creating anyway\n"
msgstr "總之還是在建立\n"
- #: g10/keygen.c:4344
++#: g10/keygen.c:4361
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr "請注意: 如需全能金鑰產生對話框請用 \"%s %s\".\n"
- #: g10/keygen.c:4387
++#: g10/keygen.c:4404
msgid "Key generation canceled.\n"
msgstr "金鑰產生已取消.\n"
- #: g10/keygen.c:4447
++#: g10/keygen.c:4464
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "無法建立備份檔案 '%s': %s\n"
- #: g10/keygen.c:4467
++#: g10/keygen.c:4484
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "請注意: 卡片金鑰的備份已儲存至 '%s'\n"
- #: g10/keygen.c:4621 g10/keygen.c:4781
++#: g10/keygen.c:4643 g10/keygen.c:4803
#, c-format
msgid "writing public key to '%s'\n"
msgstr "正在寫入公鑰至 '%s'\n"
- #: g10/keygen.c:4775
++#: g10/keygen.c:4797
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
- #: g10/keygen.c:4789
++#: g10/keygen.c:4811
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
- #: g10/keygen.c:4822
++#: g10/keygen.c:4844
msgid "public and secret key created and signed.\n"
msgstr "公鑰和私鑰已建立及簽署.\n"
- #: g10/keygen.c:4837
++#: g10/keygen.c:4859
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"
@@@ -5184,31 -4050,25 +5179,31 @@@ msgstr "
"請注意這把金鑰不能用於加密. 也許你會想藉由 \"--edit-key\" 指令\n"
"來產生加密用的子鑰.\n"
- #: g10/keygen.c:4983 g10/keygen.c:5172
++#: g10/keygen.c:5005 g10/keygen.c:5194
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
- #: g10/keygen.c:4985 g10/keygen.c:5174
++#: g10/keygen.c:5007 g10/keygen.c:5196
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
- #: g10/keygen.c:4996 g10/keygen.c:5185
++#: g10/keygen.c:5018 g10/keygen.c:5207
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "請注意: 對 v3 金鑰製造子鑰不符合 OpenPGP 規範\n"
- #: g10/keygen.c:5008 g10/keygen.c:5010
++#: g10/keygen.c:5030 g10/keygen.c:5032
msgid "Secret parts of primary key are not available.\n"
msgstr "主鑰的私鑰部分無法取用.\n"
- #: g10/keygen.c:5017 g10/keygen.c:5019
++#: g10/keygen.c:5039 g10/keygen.c:5041
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主鑰的私鑰部分存放於卡上.\n"
- #: g10/keygen.c:5038 g10/keygen.c:5199
++#: g10/keygen.c:5060 g10/keygen.c:5221
msgid "Really create? (y/N) "
msgstr "真的要建立嗎? (y/N) "
@@@ -5926,23 -4640,18 +5921,23 @@@ msgstr "這張照片正確嗎? (y/N/q)
msgid "unable to display photo ID!\n"
msgstr "無法顯示照片 ID!\n"
- #: g10/pkclist.c:72 g10/revoke.c:763
++#: g10/pkclist.c:72 g10/revoke.c:776
msgid "No reason specified"
msgstr "未指定原因"
- #: g10/pkclist.c:74 g10/revoke.c:765
++#: g10/pkclist.c:74 g10/revoke.c:778
msgid "Key is superseded"
msgstr "金鑰被代換了"
- #: g10/pkclist.c:76 g10/revoke.c:764
++#: g10/pkclist.c:76 g10/revoke.c:777
msgid "Key has been compromised"
msgstr "金鑰已經被洩漏了"
- #: g10/pkclist.c:78 g10/revoke.c:766
++#: g10/pkclist.c:78 g10/revoke.c:779
msgid "Key is no longer used"
msgstr "金鑰不再被使用了"
- #: g10/pkclist.c:80 g10/revoke.c:767
++#: g10/pkclist.c:80 g10/revoke.c:780
msgid "User ID is no longer valid"
msgstr "使用者 ID 不再有效了"
@@@ -6019,7 -4715,6 +6014,7 @@@ msgstr "
"這把金鑰的最小信任等級為: %s\n"
"\n"
- #: g10/pkclist.c:310 g10/revoke.c:792
++#: g10/pkclist.c:310 g10/revoke.c:805
msgid "Your decision? "
msgstr "你的決定是甚麼? "
@@@ -6160,48 -4827,39 +6155,48 @@@ msgstr "警告: 這把金鑰並非以�
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " 這份簽章並不屬於這個持有者\n"
- #: g10/pkclist.c:848 g10/pkclist.c:867 g10/pkclist.c:1053 g10/pkclist.c:1095
++#: g10/pkclist.c:843 g10/pkclist.c:862 g10/pkclist.c:1048 g10/pkclist.c:1090
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: 已跳過: %s\n"
- #: g10/pkclist.c:883
++#: g10/pkclist.c:878
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: 已跳過: 公鑰已停用\n"
- #: g10/pkclist.c:902 g10/pkclist.c:1066
++#: g10/pkclist.c:897 g10/pkclist.c:1061
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: 已跳過: 公鑰已存在\n"
- #: g10/pkclist.c:990
++#: g10/pkclist.c:985
#, fuzzy, c-format
#| msgid "can't connect to '%s': %s\n"
msgid "can't encrypt to '%s'\n"
msgstr "無法連接至 '%s': %s\n"
- #: g10/pkclist.c:1005
++#: g10/pkclist.c:1000
#, fuzzy, c-format
#| msgid "line %d: invalid date given\n"
msgid "option '%s' given, but no valid default keys given\n"
msgstr "第 %d 列: 無效的給定日期\n"
- #: g10/pkclist.c:1012
++#: g10/pkclist.c:1007
#, fuzzy, c-format
#| msgid "line %d: invalid date given\n"
msgid "option '%s' given, but option '%s' not given\n"
msgstr "第 %d 列: 無效的給定日期\n"
- #: g10/pkclist.c:1115
++#: g10/pkclist.c:1110
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "你沒有指定使用者 ID. (你可能得用 \"-r\")\n"
- #: g10/pkclist.c:1139
++#: g10/pkclist.c:1134
msgid "Current recipients:\n"
msgstr "目前的收件者:\n"
- #: g10/pkclist.c:1165
++#: g10/pkclist.c:1160
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6209,37 -4867,29 +6204,37 @@@ msgstr "
"\n"
"請輸入使用者 ID. 以空白列結束: "
- #: g10/pkclist.c:1189
++#: g10/pkclist.c:1184
msgid "No such user ID.\n"
msgstr "沒有這個使用者 ID.\n"
- #: g10/pkclist.c:1200 g10/pkclist.c:1277
++#: g10/pkclist.c:1195 g10/pkclist.c:1272
msgid "skipped: public key already set as default recipient\n"
msgstr "已跳過: 公鑰已經被設成預設收件者\n"
- #: g10/pkclist.c:1222
++#: g10/pkclist.c:1217
msgid "Public key is disabled.\n"
msgstr "公鑰已停用.\n"
- #: g10/pkclist.c:1232
++#: g10/pkclist.c:1227
msgid "skipped: public key already set\n"
msgstr "已跳過: 公鑰已設過\n"
- #: g10/pkclist.c:1267
++#: g10/pkclist.c:1262
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "未知的預設收件者 \"%s\"\n"
- #: g10/pkclist.c:1316
++#: g10/pkclist.c:1311
msgid "no valid addressees\n"
msgstr "沒有有效的地址\n"
- #: g10/pkclist.c:1669
++#: g10/pkclist.c:1664
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "請注意: 金鑰 %s 沒有 %s 功能\n"
- #: g10/pkclist.c:1694
++#: g10/pkclist.c:1689
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "警告: 金鑰 %s 沒有 %s 的偏好設定\n"
@@@ -6341,7 -4969,6 +6336,7 @@@ msgstr "私鑰可用.\n
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
- #: g10/revoke.c:335 g10/revoke.c:733
++#: g10/revoke.c:335 g10/revoke.c:746
msgid "ASCII armored output forced.\n"
msgstr "已強迫使用 ASCII 封裝過的輸出.\n"
@@@ -6359,18 -4983,15 +6354,18 @@@ msgstr "已建立撤銷憑證.\n
msgid "no revocation keys found for \"%s\"\n"
msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
- #: g10/revoke.c:552
++#: g10/revoke.c:565
msgid "This is a revocation certificate for the OpenPGP key:"
msgstr "這把 OpenPGP 金鑰有一份撤銷憑證."
- #: g10/revoke.c:568
++#: g10/revoke.c:581
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 ""
- #: g10/revoke.c:571
++#: g10/revoke.c:584
#, fuzzy
#| msgid ""
#| "Use it to revoke this key in case of a compromise or loss of\n"
@@@ -6389,7 -5010,6 +6384,7 @@@ msgstr "
"辦法是產生一份新的撤銷憑證, 並且指明撤銷\n"
"的理由."
- #: g10/revoke.c:577
++#: g10/revoke.c:590
#, fuzzy
#| msgid ""
#| "To avoid an accidental use of this file, a colon has been inserted\n"
@@@ -6404,13 -5024,11 +6399,13 @@@ msgstr "
"真的要使用這份撤銷憑證前, 請先用文字編輯器把那個冒號移除,\n"
"撤銷憑證才能使用."
- #: g10/revoke.c:596
++#: g10/revoke.c:609
#, fuzzy, c-format
#| msgid "Revocation certificate created.\n"
msgid "revocation certificate stored as '%s.rev'\n"
msgstr "已建立撤銷憑證.\n"
- #: g10/revoke.c:640
++#: g10/revoke.c:653
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key \"%s\" not found\n"
@@@ -6419,22 -5037,18 +6414,22 @@@ msgstr "找不到私鑰 \"%s\": %s\n
#. TRANSLATORS: The %s prints a key specification which
#. for example has been given at the command line. Several lines
#. lines with secret key infos are printed after this message.
- #: g10/revoke.c:667
++#: g10/revoke.c:680
#, c-format
msgid "'%s' matches multiple secret keys:\n"
msgstr ""
- #: g10/revoke.c:694
++#: g10/revoke.c:707
#, fuzzy, c-format
#| msgid "error creating keyring '%s': %s\n"
msgid "error searching the keyring: %s\n"
msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
- #: g10/revoke.c:717
++#: g10/revoke.c:730
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "要為這把金鑰建立一份撤銷憑證嗎? (y/N) "
- #: g10/revoke.c:741
++#: g10/revoke.c:754
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6453,33 -5067,26 +6448,33 @@@ msgstr "
"但是千萬小心: 你的機器上的列印系統可能會在列印過\n"
"程中把這些資料暫存在某個其他人也能夠看得到的地方!\n"
- #: g10/revoke.c:775
++#: g10/revoke.c:788
msgid "Please select the reason for the revocation:\n"
msgstr "請選擇撤銷的原因:\n"
- #: g10/revoke.c:785
++#: g10/revoke.c:798
msgid "Cancel"
msgstr "取消"
- #: g10/revoke.c:787
++#: g10/revoke.c:800
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(也許你會想要在這裡選擇 %d)\n"
- #: g10/revoke.c:828
++#: g10/revoke.c:841
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "請輸入選用的描述; 以空白列結束:\n"
- #: g10/revoke.c:856
++#: g10/revoke.c:869
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "撤銷原因: %s\n"
- #: g10/revoke.c:858
++#: g10/revoke.c:871
msgid "(No description given)\n"
msgstr "(沒有給定描述)\n"
- #: g10/revoke.c:863
++#: g10/revoke.c:876
msgid "Is this okay? (y/N) "
msgstr "這樣可以嗎? (y/N) "
@@@ -6862,10 -5395,6 +6857,10 @@@ msgstr "建立暫存檔時出錯: %s\n
msgid "TOFU DB error"
msgstr ""
+#: 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
++#: g10/tofu.c:3408
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error reading TOFU database: %s\n"
@@@ -6900,7 -5424,6 +6895,7 @@@ msgstr "
msgid "error opening TOFU database '%s': %s\n"
msgstr "開啟 '%s' 時出錯: %s\n"
- #: g10/tofu.c:1148 g10/tofu.c:3453 g10/tofu.c:3591
++#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error updating TOFU database: %s\n"
@@@ -7202,19 -5676,15 +7197,19 @@@ msgid_plural "
"to mark it as being bad.\n"
msgstr[0] ""
- #: 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
++#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
++#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
#, fuzzy, c-format
#| msgid "error sending data: %s\n"
msgid "error opening TOFU database: %s\n"
msgstr "送出資料時出錯: %s\n"
- #: g10/tofu.c:3528
++#: g10/tofu.c:3539
#, c-format
msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
msgstr ""
- #: g10/tofu.c:3915
++#: g10/tofu.c:3943
#, fuzzy, c-format
#| msgid "error writing public keyring '%s': %s\n"
msgid "error setting policy for key %s, user id \"%s\": %s"
@@@ -7277,7 -5735,6 +7272,7 @@@ msgstr "正在使用 %s 信任模型\n
msgid "no need for a trustdb check\n"
msgstr "不需要檢查信任資料庫\n"
- #: g10/trustdb.c:549 g10/trustdb.c:2236
++#: g10/trustdb.c:549 g10/trustdb.c:2240
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "下次信任資料庫檢查將於 %s 進行\n"
@@@ -7305,36 -5757,30 +7300,36 @@@ msgstr "請做一次 --check-trustdb\n
msgid "checking the trustdb\n"
msgstr "正在檢查信任資料庫\n"
- #: g10/trustdb.c:1957
++#: g10/trustdb.c:1961
#, fuzzy, c-format
#| msgid "%lu keys processed so far\n"
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "目前已處理 %lu 把金鑰\n"
- #: g10/trustdb.c:1960
++#: g10/trustdb.c:1964
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
msgstr[0] "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
- #: g10/trustdb.c:2030
++#: g10/trustdb.c:2034
msgid "no ultimately trusted keys found\n"
msgstr "沒有找到任何徹底信任的金鑰\n"
- #: g10/trustdb.c:2044
++#: g10/trustdb.c:2048
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "找不到徹底信任金鑰 %s 的公鑰\n"
- #: g10/trustdb.c:2162
++#: g10/trustdb.c:2166
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr "深度: %d 有效: %3d 已簽署: %3d 信任: %d-, %dq, %dn, %dm, %df, %du\n"
- #: g10/trustdb.c:2243
++#: g10/trustdb.c:2247
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
@@@ -7755,55 -6115,42 +7750,55 @@@ msgstr "||請在讀卡機鍵盤上輸�
msgid "|N|Initial New PIN"
msgstr "|N|開始新增個人識別碼 (PIN)"
- #: scd/scdaemon.c:114
++#: scd/scdaemon.c:115
msgid "run in multi server mode (foreground)"
msgstr "以多重伺服器模式執行 (前景)"
- #: scd/scdaemon.c:124 sm/gpgsm.c:339 dirmngr/dirmngr.c:182
++#: scd/scdaemon.c:125 sm/gpgsm.c:339 dirmngr/dirmngr.c:185
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|等級|設定除錯等級為指定等級"
- #: scd/scdaemon.c:131 tools/gpgconf-comp.c:663
++#: scd/scdaemon.c:132 tools/gpgconf-comp.c:664
msgid "|FILE|write a log to FILE"
msgstr "|檔案|將日誌寫入至指定檔案"
- #: scd/scdaemon.c:133
++#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
msgstr "|N|從 N 埠連線至讀卡機"
- #: scd/scdaemon.c:135
++#: scd/scdaemon.c:136
msgid "|NAME|use NAME as ct-API driver"
msgstr "|名稱|使用指定名稱做為 ct-API 驅動程式"
- #: scd/scdaemon.c:137
++#: scd/scdaemon.c:138
msgid "|NAME|use NAME as PC/SC driver"
msgstr "|名稱|使用指定名稱做為 PC/SC 驅動程式"
- #: scd/scdaemon.c:140
++#: scd/scdaemon.c:141
msgid "do not use the internal CCID driver"
msgstr "不要使用內部的 CCID 驅動程式"
- #: scd/scdaemon.c:146
++#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr "|N|沒有活動達 N 秒後就與卡片斷線"
- #: scd/scdaemon.c:149
++#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
msgstr "不要使用讀卡機鍵盤"
- #: scd/scdaemon.c:154
++#: scd/scdaemon.c:155
msgid "deny the use of admin card commands"
msgstr "禁用管理者卡片指令"
- #: scd/scdaemon.c:157
++#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
msgstr "輸入 PIN 時在輸入區顯示成變動長度"
- #: scd/scdaemon.c:291
++#: scd/scdaemon.c:297
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "用法: @SCDAEMON@ [選項] (或用 -h 求助)"
- #: scd/scdaemon.c:293
++#: scd/scdaemon.c:299
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
@@@ -7811,16 -6158,13 +7806,16 @@@ msgstr "
"語法: scdaemon [選項] [指令 [引數]]\n"
"@GNUPG@ 智慧卡服務\n"
- #: scd/scdaemon.c:793
++#: scd/scdaemon.c:803
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr "請使用 '--daemon' 選項來將此程式執行於背景\n"
- #: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2053
++#: scd/scdaemon.c:1177 dirmngr/dirmngr.c:2072
#, c-format
msgid "handler for fd %d started\n"
msgstr "用於 fd %d 的經手程式已啟動\n"
- #: scd/scdaemon.c:1178 dirmngr/dirmngr.c:2058
++#: scd/scdaemon.c:1189 dirmngr/dirmngr.c:2080
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "用於 fd %d 的經手程式已終止\n"
@@@ -8499,7 -6690,6 +8494,7 @@@ msgstr "|檔案|將此金鑰鑰匙圈�
msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|使用者-ID|使用指定使用者 ID 做為預設私鑰"
- #: sm/gpgsm.c:334 tools/gpgconf-comp.c:830
++#: sm/gpgsm.c:334 tools/gpgconf-comp.c:831
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|使用此金鑰伺服器來查找金鑰"
@@@ -8554,17 -6734,14 +8549,17 @@@ msgstr "%s:%u: 正在跳過這一列\n
msgid "could not parse keyserver\n"
msgstr "無法剖析金鑰伺服器\n"
- #: sm/gpgsm.c:1684
++#: sm/gpgsm.c:1685
#, c-format
msgid "importing common certificates '%s'\n"
msgstr "正在匯入通用憑證 '%s'\n"
- #: sm/gpgsm.c:1725
++#: sm/gpgsm.c:1726
#, c-format
msgid "can't sign using '%s': %s\n"
msgstr "無法用 '%s' 來簽署: %s\n"
- #: sm/gpgsm.c:2082
++#: sm/gpgsm.c:2084
msgid "invalid command (there is no implicit command)\n"
msgstr "無效的指令 (沒有這樣的指令)\n"
@@@ -9483,112 -7470,84 +9478,112 @@@ msgstr "應該要有絕對檔名\n
msgid "looking up '%s'\n"
msgstr "正在查找 '%s'\n"
- #: dirmngr/dirmngr.c:166
++#: dirmngr/dirmngr.c:169
msgid "list the contents of the CRL cache"
msgstr "列出 CRL 快取的內容"
- #: dirmngr/dirmngr.c:167
++#: dirmngr/dirmngr.c:170
msgid "|FILE|load CRL from FILE into cache"
msgstr "|檔案|從指定檔案載入 CRL 至快取"
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:171
msgid "|URL|fetch a CRL from URL"
msgstr "|網址|從指定網址取得 CRL"
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:172
msgid "shutdown the dirmngr"
msgstr "關閉 dirmngr"
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:173
msgid "flush the cache"
msgstr "清除快取"
- #: dirmngr/dirmngr.c:185 tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:740
- #: tools/gpgconf-comp.c:844 tools/gpgconf-comp.c:940
++#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
++#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
msgid "|FILE|write server mode logs to FILE"
msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
- #: dirmngr/dirmngr.c:186
++#: dirmngr/dirmngr.c:189
msgid "run without asking a user"
msgstr "以不詢問使用者的方式執行"
- #: dirmngr/dirmngr.c:187
++#: dirmngr/dirmngr.c:190
msgid "force loading of outdated CRLs"
msgstr "強迫載入過時的 CRL"
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:191
msgid "allow sending OCSP requests"
msgstr "允許送出 OCSP 請求"
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:193
msgid "allow online software version check"
msgstr ""
- #: dirmngr/dirmngr.c:191
++#: dirmngr/dirmngr.c:194
msgid "inhibit the use of HTTP"
msgstr "避免使用 HTTP"
- #: dirmngr/dirmngr.c:192
++#: dirmngr/dirmngr.c:195
msgid "inhibit the use of LDAP"
msgstr "避免使用 LDAP"
- #: dirmngr/dirmngr.c:194
++#: dirmngr/dirmngr.c:197
msgid "ignore HTTP CRL distribution points"
msgstr "忽略 HTTP CRL 分布點"
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:199
msgid "ignore LDAP CRL distribution points"
msgstr "忽略 LDAP CRL 分布點"
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:201
msgid "ignore certificate contained OCSP service URLs"
msgstr "忽略含有 OCSP 伺服器網址的憑證"
- #: dirmngr/dirmngr.c:201
++#: dirmngr/dirmngr.c:204
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|網址|重新導向所有對指定網址提出的 HTTP 請求"
- #: dirmngr/dirmngr.c:203
++#: dirmngr/dirmngr.c:206
msgid "|HOST|use HOST for LDAP queries"
msgstr "|主機|指定 LDAP 查詢主機"
- #: dirmngr/dirmngr.c:205
++#: dirmngr/dirmngr.c:208
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "不要將主機備案與 --ldap-proxy 並用"
- #: dirmngr/dirmngr.c:208
++#: dirmngr/dirmngr.c:211
msgid "|FILE|read LDAP server list from FILE"
msgstr "|檔案|從指定檔案讀取 LDAP 伺服器清單"
- #: dirmngr/dirmngr.c:210
++#: dirmngr/dirmngr.c:213
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr "將從 CRL 分布點發現的新伺服器加入至伺服器清單"
- #: dirmngr/dirmngr.c:213 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|把 LDAP 逾時設成 N 秒"
- #: dirmngr/dirmngr.c:216
++#: dirmngr/dirmngr.c:219
msgid "|URL|use OCSP responder at URL"
msgstr "|網址|使用位於指定網址的 OCSP 回應程式"
- #: dirmngr/dirmngr.c:218
++#: dirmngr/dirmngr.c:221
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|由 FPR 簽署的 OCSP 回應"
- #: dirmngr/dirmngr.c:224
++#: dirmngr/dirmngr.c:227
msgid "|N|do not return more than N items in one query"
msgstr "|N|單次查詢不要傳回超過 N 筆項目"
- #: dirmngr/dirmngr.c:229
++#: dirmngr/dirmngr.c:232
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr "|檔案|在 HKP over TLS 的指定檔案中使用 CA 憑證"
- #: dirmngr/dirmngr.c:231
++#: dirmngr/dirmngr.c:234
msgid "route all network traffic via Tor"
msgstr ""
- #: dirmngr/dirmngr.c:258
++#: dirmngr/dirmngr.c:262
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@@ -9597,11 -7556,9 +9592,11 @@@ msgstr "
"@\n"
"(請參照「資訊」手冊來取得所有命令和選項的完整清單)\n"
- #: dirmngr/dirmngr.c:392
++#: dirmngr/dirmngr.c:400
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "用法: @DIRMNGR@ [選項] (或用 -h 求助)"
- #: dirmngr/dirmngr.c:394
++#: dirmngr/dirmngr.c:402
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9609,77 -7566,60 +9604,77 @@@ msgstr "
"語法: @DIRMNGR@ [選項] [指令 [引數]]\n"
"@GNUPG@ 的金鑰伺服器, CRL, OCSP 存取\n"
- #: dirmngr/dirmngr.c:474
++#: dirmngr/dirmngr.c:482
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "有效的除錯等級為: %s\n"
- #: dirmngr/dirmngr.c:560 tools/gpgconf.c:553 tools/gpgconf.c:588
- #: tools/gpgconf.c:671
++#: dirmngr/dirmngr.c:568 tools/gpgconf.c:618 tools/gpgconf.c:653
++#: tools/gpgconf.c:736
#, c-format
msgid "usage: %s [options] "
msgstr "用法: %s [選項] "
- #: dirmngr/dirmngr.c:1197
++#: dirmngr/dirmngr.c:1209
msgid "colons are not allowed in the socket name\n"
msgstr "socket 名稱內不允許使用冒號\n"
- #: dirmngr/dirmngr.c:1428 dirmngr/server.c:1641
++#: dirmngr/dirmngr.c:1441 dirmngr/server.c:1735
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "從 '%s' 取回 CRL 時失敗: %s\n"
- #: dirmngr/dirmngr.c:1434 dirmngr/server.c:1647
++#: dirmngr/dirmngr.c:1447 dirmngr/server.c:1741
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "從 '%s' 處理 CRL 時失敗: %s\n"
- #: dirmngr/dirmngr.c:1626
++#: dirmngr/dirmngr.c:1639
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: 列太長 - 已跳過\n"
- #: dirmngr/dirmngr.c:1681 dirmngr/dirmngr.c:1765
++#: dirmngr/dirmngr.c:1694 dirmngr/dirmngr.c:1778
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr "%s:%u: 偵測到無效的指紋\n"
- #: dirmngr/dirmngr.c:1717 dirmngr/dirmngr.c:1743 tools/gpgconf-comp.c:4161
++#: dirmngr/dirmngr.c:1730 dirmngr/dirmngr.c:1756 tools/gpgconf-comp.c:4189
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr "%s:%u: 讀取錯誤: %s\n"
- #: dirmngr/dirmngr.c:1772
++#: dirmngr/dirmngr.c:1785
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr "%s:%u: 列尾的垃圾已忽略\n"
- #: dirmngr/dirmngr.c:1838
++#: dirmngr/dirmngr.c:1851
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr "收到 SIGHUP - 正在重新讀取組態並清除快取\n"
- #: dirmngr/dirmngr.c:1877
++#: dirmngr/dirmngr.c:1891
msgid "SIGUSR2 received - no action defined\n"
msgstr "收到 SIGUSR2 - 無定義行動\n"
- #: dirmngr/dirmngr.c:1882
++#: dirmngr/dirmngr.c:1896
msgid "SIGTERM received - shutting down ...\n"
msgstr "收到 SIGTERM - 正在關閉 ...\n"
- #: dirmngr/dirmngr.c:1884
++#: dirmngr/dirmngr.c:1898
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "收到 SIGTERM - 還有 %d 個使用中的連線\n"
- #: dirmngr/dirmngr.c:1889
++#: dirmngr/dirmngr.c:1903
msgid "shutdown forced\n"
msgstr "已強迫關閉\n"
- #: dirmngr/dirmngr.c:1897
++#: dirmngr/dirmngr.c:1911
msgid "SIGINT received - immediate shutdown\n"
msgstr "收到 SIGINT - 立即關閉\n"
- #: dirmngr/dirmngr.c:1904
++#: dirmngr/dirmngr.c:1918
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "收到訊號 %d - 無定義行動\n"
@@@ -10106,76 -7955,60 +10101,76 @@@ msgstr "OCSP 回應程式傳回非當�
msgid "OCSP responder returned an too old status\n"
msgstr "OCSP 回應程式傳回老舊的狀態\n"
- #: dirmngr/server.c:385 dirmngr/server.c:494 dirmngr/server.c:540
++#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assuan_inquire(%s) 失敗: %s\n"
- #: dirmngr/server.c:994
++#: dirmngr/server.c:1088
msgid "ldapserver missing"
msgstr "遺失 ldapserver"
- #: dirmngr/server.c:1068
++#: dirmngr/server.c:1162
msgid "serialno missing in cert ID"
msgstr "憑證 ID 中遺失 serialno"
- #: dirmngr/server.c:1204 dirmngr/server.c:1290 dirmngr/server.c:1726
- #: dirmngr/server.c:1797 dirmngr/server.c:2332 dirmngr/server.c:2348
++#: dirmngr/server.c:1298 dirmngr/server.c:1384 dirmngr/server.c:1820
++#: dirmngr/server.c:1891 dirmngr/server.c:2426 dirmngr/server.c:2442
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assuan_inquire 失敗: %s\n"
- #: dirmngr/server.c:1333
++#: dirmngr/server.c:1427
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fetch_cert_by_url 失敗: %s\n"
- #: dirmngr/server.c:1345 dirmngr/server.c:1376 dirmngr/server.c:1535
++#: dirmngr/server.c:1439 dirmngr/server.c:1470 dirmngr/server.c:1629
#, c-format
msgid "error sending data: %s\n"
msgstr "送出資料時出錯: %s\n"
- #: dirmngr/server.c:1483
++#: dirmngr/server.c:1577
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "start_cert_fetch 失敗: %s\n"
- #: dirmngr/server.c:1516
++#: dirmngr/server.c:1610
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fetch_next_cert 失敗: %s\n"
- #: dirmngr/server.c:1543
++#: dirmngr/server.c:1637
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d 已超出\n"
- #: dirmngr/server.c:2592
++#: dirmngr/server.c:2698
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "無法配置控制結構: %s\n"
- #: dirmngr/server.c:2603
++#: dirmngr/server.c:2709
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "配置 assuan 脈絡失敗: %s\n"
- #: dirmngr/server.c:2624
++#: dirmngr/server.c:2730
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "伺服器啟始失敗: %s\n"
- #: dirmngr/server.c:2632
++#: dirmngr/server.c:2738
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "向 Assuan 註冊指令時失敗: %s\n"
- #: dirmngr/server.c:2663
++#: dirmngr/server.c:2771
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan 接受問題: %s\n"
- #: dirmngr/server.c:2682
++#: dirmngr/server.c:2790
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuan 處理時失敗: %s\n"
@@@ -10213,7 -8038,6 +10208,7 @@@ msgstr "憑證鏈完好\n
msgid "certificate should not have been used for CRL signing\n"
msgstr "憑證應該還未被用於 CRL 簽署\n"
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:100 tools/symcryptrun.c:179
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:102 tools/symcryptrun.c:179
msgid "quiet"
msgstr "安靜模式"
@@@ -10304,275 -8108,210 +10299,275 @@@ msgstr "送出列時失敗: %s\n
msgid "error sending standard options: %s\n"
msgstr "送出標準選項時出錯: %s\n"
- #: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:616 tools/gpgconf-comp.c:691
- #: tools/gpgconf-comp.c:797 tools/gpgconf-comp.c:896
++#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
++#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
msgid "Options controlling the diagnostic output"
msgstr "控制著診斷性輸出的選項"
- #: tools/gpgconf-comp.c:493 tools/gpgconf-comp.c:629 tools/gpgconf-comp.c:704
- #: tools/gpgconf-comp.c:810 tools/gpgconf-comp.c:919
++#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
++#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
msgid "Options controlling the configuration"
msgstr "控制著組態的選項"
- #: tools/gpgconf-comp.c:516 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:735
- #: tools/gpgconf-comp.c:839 tools/gpgconf-comp.c:932
++#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
++#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
msgid "Options useful for debugging"
msgstr "對除錯有幫助的選項"
- #: tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:668 tools/gpgconf-comp.c:852
++#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
msgid "Options controlling the security"
msgstr "控制著安全性的選項"
- #: tools/gpgconf-comp.c:536
++#: tools/gpgconf-comp.c:537
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|在 N 秒之後讓 SSH 金鑰過期"
- #: tools/gpgconf-comp.c:540
++#: tools/gpgconf-comp.c:541
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|把個人識別碼 (PIN) 快取最大生存時間設成 N 秒"
- #: tools/gpgconf-comp.c:544
++#: tools/gpgconf-comp.c:545
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|把 SSH 金鑰最大生存時間設成 N 秒"
- #: tools/gpgconf-comp.c:568
++#: tools/gpgconf-comp.c:569
msgid "Options enforcing a passphrase policy"
msgstr "強制執行密語原則的選項"
- #: tools/gpgconf-comp.c:571
++#: tools/gpgconf-comp.c:572
msgid "do not allow bypassing the passphrase policy"
msgstr "不允許略過密語原則"
- #: tools/gpgconf-comp.c:575
++#: tools/gpgconf-comp.c:576
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|把新密語所需的最短長度設成 N"
- #: tools/gpgconf-comp.c:579
++#: tools/gpgconf-comp.c:580
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|新密語至少要有 N 個非字母的字符"
- #: tools/gpgconf-comp.c:583
++#: tools/gpgconf-comp.c:584
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|檔案|用指定檔案中的樣式來檢查新密語"
- #: tools/gpgconf-comp.c:587
++#: tools/gpgconf-comp.c:588
msgid "|N|expire the passphrase after N days"
msgstr "|N|在 N 天之後讓密語過期"
- #: tools/gpgconf-comp.c:591
++#: tools/gpgconf-comp.c:592
msgid "do not allow the reuse of old passphrases"
msgstr "不允許重複使用舊密語"
- #: tools/gpgconf-comp.c:595
++#: tools/gpgconf-comp.c:596
#, fuzzy
#| msgid "|N|set LDAP timeout to N seconds"
msgid "|N|set the Pinentry timeout to N seconds"
msgstr "|N|把 LDAP 逾時設成 N 秒"
- #: tools/gpgconf-comp.c:706 tools/gpgconf-comp.c:812
++#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
msgid "|NAME|use NAME as default secret key"
msgstr "|名字|使用指定名字做為預設私鑰"
- #: tools/gpgconf-comp.c:709 tools/gpgconf-comp.c:815
++#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|名字|也加密給指定名字的使用者 ID"
- #: tools/gpgconf-comp.c:712
++#: tools/gpgconf-comp.c:713
msgid "|SPEC|set up email aliases"
msgstr "|SPEC|設定電子郵件別名"
- #: tools/gpgconf-comp.c:748 tools/gpgconf-comp.c:971
++#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
msgid "Configuration for Keyservers"
msgstr "金鑰伺服器組態"
- #: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:973
++#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
msgid "|URL|use keyserver at URL"
msgstr "|URL|使用位於 URL 的金鑰伺服器"
- #: tools/gpgconf-comp.c:753
++#: tools/gpgconf-comp.c:754
msgid "allow PKA lookups (DNS requests)"
msgstr "允許 PKA 查找 (DNS 請求)"
- #: tools/gpgconf-comp.c:756
++#: tools/gpgconf-comp.c:757
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr "|MECHANISMS|使用 MECHANISMS 機制來從郵件地址找出金鑰"
- #: tools/gpgconf-comp.c:763 tools/gpgconf-comp.c:824
++#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
msgid "disable all access to the dirmngr"
msgstr "停用所有的 dirmngr 存取"
- #: tools/gpgconf-comp.c:827
++#: tools/gpgconf-comp.c:828
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|名稱|將指定名稱的編碼用於 PKCS#12 密語"
- #: tools/gpgconf-comp.c:860
++#: tools/gpgconf-comp.c:864
msgid "do not check CRLs for root certificates"
msgstr "不要為根憑證檢查 CRL"
- #: tools/gpgconf-comp.c:909
++#: tools/gpgconf-comp.c:913
msgid "Options controlling the format of the output"
msgstr "控制著輸出格式的選項"
- #: tools/gpgconf-comp.c:951
++#: tools/gpgconf-comp.c:955
msgid "Options controlling the interactivity and enforcement"
msgstr "控制著互動及強制執行的選項"
- #: tools/gpgconf-comp.c:964
++#: tools/gpgconf-comp.c:968
#, fuzzy
#| msgid "Options controlling the security"
msgid "Options controlling the use of Tor"
msgstr "控制著安全性的選項"
- #: tools/gpgconf-comp.c:978
++#: tools/gpgconf-comp.c:982
msgid "Configuration for HTTP servers"
msgstr "HTTP 伺服器組態"
- #: tools/gpgconf-comp.c:989
++#: tools/gpgconf-comp.c:993
msgid "use system's HTTP proxy setting"
msgstr "使用系統的 HTTP 代理伺服器設定"
- #: tools/gpgconf-comp.c:994
++#: tools/gpgconf-comp.c:998
msgid "Configuration of LDAP servers to use"
msgstr "要用的 LDAP 伺服器組態"
- #: tools/gpgconf-comp.c:1023
++#: tools/gpgconf-comp.c:1027
msgid "LDAP server list"
msgstr "LDAP 伺服器清單"
- #: tools/gpgconf-comp.c:1031
++#: tools/gpgconf-comp.c:1035
msgid "Configuration for OCSP"
msgstr "OCSP 組態"
- #: tools/gpgconf-comp.c:1112
++#: tools/gpgconf-comp.c:1116
#, fuzzy
#| msgid "GPG for OpenPGP"
msgid "OpenPGP"
msgstr "OpenPGP 版 GPG"
- #: tools/gpgconf-comp.c:1113
++#: tools/gpgconf-comp.c:1117
msgid "Private Keys"
msgstr ""
- #: tools/gpgconf-comp.c:1114
++#: tools/gpgconf-comp.c:1118
#, fuzzy
#| msgid "Smartcard Daemon"
msgid "Smartcards"
msgstr "智慧卡服務"
- #: tools/gpgconf-comp.c:1115
++#: tools/gpgconf-comp.c:1119
#, fuzzy
#| msgid "GPG for S/MIME"
msgid "S/MIME"
msgstr "S/MIME 版 GPG"
- #: tools/gpgconf-comp.c:1116
++#: tools/gpgconf-comp.c:1120
msgid "Network"
msgstr ""
- #: tools/gpgconf-comp.c:1117
++#: tools/gpgconf-comp.c:1121
#, fuzzy
#| msgid "PIN and Passphrase Entry"
msgid "Passphrase Entry"
msgstr "個人識別碼及密語項目"
- #: tools/gpgconf-comp.c:1308
++#: tools/gpgconf-comp.c:1312
msgid "Component not suitable for launching"
msgstr "元件不適合啟動"
- #: tools/gpgconf-comp.c:3440
++#: tools/gpgconf-comp.c:3444
#, c-format
msgid "External verification of component %s failed"
msgstr "元件 %s 的外部驗證失敗"
- #: tools/gpgconf-comp.c:3591
++#: tools/gpgconf-comp.c:3595
msgid "Note that group specifications are ignored\n"
msgstr "請注意群組規格已忽略\n"
- #: tools/gpgconf-comp.c:4165
++#: tools/gpgconf-comp.c:4193
#, fuzzy, c-format
#| msgid "error closing '%s': %s\n"
msgid "error closing '%s'\n"
msgstr "關閉 '%s' 時出錯: %s\n"
- #: tools/gpgconf-comp.c:4167
++#: tools/gpgconf-comp.c:4195
#, fuzzy, c-format
#| msgid "error hashing '%s': %s\n"
msgid "error parsing '%s'\n"
msgstr "計算 '%s' 的雜湊時出錯: %s\n"
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
msgid "list all components"
msgstr "列出所有的元件"
- #: tools/gpgconf.c:74
++#: tools/gpgconf.c:76
msgid "check all programs"
msgstr "檢查所有的程式"
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
msgid "|COMPONENT|list options"
msgstr "|元件|列出選項"
- #: tools/gpgconf.c:76
++#: tools/gpgconf.c:78
msgid "|COMPONENT|change options"
msgstr "|元件|變更選項"
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
msgid "|COMPONENT|check options"
msgstr "|元件|檢查選項"
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
msgid "apply global default values"
msgstr "套用全域預設值"
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
#, fuzzy
#| msgid "|FILE|take policy information from FILE"
msgid "|FILE|update configuration files using FILE"
msgstr "|檔案|從指定檔案中取得原則資訊"
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:85
msgid "get the configuration directories for @GPGCONF@"
msgstr "取得 @GPGCONF@ 的組態目錄"
- #: tools/gpgconf.c:85
++#: tools/gpgconf.c:87
msgid "list global configuration file"
msgstr "列出全域組態檔"
- #: tools/gpgconf.c:87
++#: tools/gpgconf.c:89
msgid "check global configuration file"
msgstr "檢查全域組態檔案"
- #: tools/gpgconf.c:89
++#: tools/gpgconf.c:91
#, fuzzy
#| msgid "update the trust database"
msgid "query the software version database"
msgstr "更新信任資料庫"
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:92
msgid "reload all or a given component"
msgstr "重新載入所有或給定的元件"
- #: tools/gpgconf.c:91
++#: tools/gpgconf.c:93
msgid "launch a given component"
msgstr "啟動給定的元件"
- #: tools/gpgconf.c:92
++#: tools/gpgconf.c:94
msgid "kill a given component"
msgstr "刪除給定的元件"
- #: tools/gpgconf.c:98
++#: tools/gpgconf.c:100
msgid "use as output file"
msgstr "當作輸出檔案來使用"
- #: tools/gpgconf.c:102
++#: tools/gpgconf.c:104
msgid "activate changes at runtime, if possible"
msgstr "如果可能的話, 在執行期啟用變更"
- #: tools/gpgconf.c:128
++#: tools/gpgconf.c:136
msgid "Usage: @GPGCONF@ [options] (-h for help)"
msgstr "用法: @GPGCONF@ [選項] (或用 -h 求助)"
- #: tools/gpgconf.c:131
++#: tools/gpgconf.c:139
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10580,15 -8319,12 +10575,15 @@@ msgstr "
"語法: @GPGCONF@ [選項]\n"
"管理 @GNUPG@ 系統工具的組態選項\n"
- #: tools/gpgconf.c:555 tools/gpgconf.c:590
++#: tools/gpgconf.c:620 tools/gpgconf.c:655
msgid "Need one component argument"
msgstr "需要一個元件引數"
- #: tools/gpgconf.c:564 tools/gpgconf.c:614 tools/gpgconf.c:647
++#: tools/gpgconf.c:629 tools/gpgconf.c:679 tools/gpgconf.c:712
msgid "Component not found"
msgstr "找不到元件"
- #: tools/gpgconf.c:673
++#: tools/gpgconf.c:738
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